diff --git a/app/modules/api/Controllers/AccountController.php b/app/modules/api/Controllers/AccountController.php
index 15d17b57..4f138ef4 100644
--- a/app/modules/api/Controllers/AccountController.php
+++ b/app/modules/api/Controllers/AccountController.php
@@ -24,12 +24,12 @@
 
 namespace SP\Modules\Api\Controllers;
 
-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Services\Account\AccountRequest;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\Account\AccountService;
 use SP\Services\Api\ApiResponse;
 
@@ -166,7 +166,7 @@ class AccountController extends ControllerBase
             $accountSearchFilter->setLimitCount($this->apiService->getParamInt('count', false, 50));
             $accountSearchFilter->setSortOrder($this->apiService->getParamInt('order', false, AccountSearchFilter::SORT_DEFAULT));
 
-            $this->returnResponse(new ApiResponse($this->accountService->getByFilter($accountSearchFilter)->getData()));
+            $this->returnResponse(new ApiResponse($this->accountService->getByFilter($accountSearchFilter)));
         } catch (\Exception $e) {
             $this->returnResponseException($e);
 
diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php
index 8e0554c3..3333d02f 100644
--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -34,7 +34,7 @@ use SP\Services\Upgrade\UpgradeAppService;
 use SP\Services\Upgrade\UpgradeDatabaseService;
 use SP\Services\Upgrade\UpgradeUtil;
 use SP\Storage\Database\Database;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Util\HttpUtil;
 
 /**
@@ -57,6 +57,7 @@ class Init extends ModuleBase
      * Module constructor.
      *
      * @param Container $container
+     *
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
      */
@@ -70,6 +71,7 @@ class Init extends ModuleBase
 
     /**
      * @param string $controller
+     *
      * @throws InitializationException
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
@@ -105,7 +107,7 @@ class Init extends ModuleBase
         $this->checkUpgrade();
 
         // Checks if the database is set up
-        DBUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName());
+        DatabaseUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName());
 
         // Initialize event handlers
         $this->initEventHandlers();
diff --git a/app/modules/web/Controllers/ConfigMailController.php b/app/modules/web/Controllers/ConfigMailController.php
index c45f5bfe..ccdddcf1 100644
--- a/app/modules/web/Controllers/ConfigMailController.php
+++ b/app/modules/web/Controllers/ConfigMailController.php
@@ -32,7 +32,7 @@ use SP\Core\Events\EventMessage;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 use SP\Providers\Mail\MailParams;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 
 /**
  * Class ConfigMailController
diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php
index f11c4c06..8b38559c 100644
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -42,7 +42,7 @@ use SP\Services\Task\Task;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Services\UserProfile\UserProfileService;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\MySQLHandler;
 use SP\Util\Checks;
 use SP\Util\Util;
@@ -331,7 +331,7 @@ class ConfigManagerController extends ControllerBase
         $template->setBase('config');
         $template->addTemplate('info');
 
-        $template->assign('dbInfo', DBUtil::getDBinfo($this->dic->get(MySQLHandler::class)));
+        $template->assign('dbInfo', DatabaseUtil::getDBinfo($this->dic->get(MySQLHandler::class)));
         $template->assign('dbName', $this->configData->getDbName() . '@' . $this->configData->getDbHost());
         $template->assign('configBackupDate', date('r', $this->dic->get(ConfigService::class)->getByParam('config_backup_date', 0)));
         $template->assign('plugins', PluginUtil::getLoadedPlugins());
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
index d5ff8d95..1e681ddb 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
@@ -24,14 +24,14 @@
 
 namespace SP\Modules\Web\Controllers\Helpers\Account;
 
-use SP\Account\AccountAcl;
-use SP\Account\AccountSearchItem;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\UI\ThemeIcons;
 use SP\Html\DataGrid\DataGridAction;
 use SP\Html\DataGrid\DataGridActionType;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
+use SP\Services\Account\AccountAcl;
+use SP\Services\Account\AccountSearchItem;
 
 /**
  * Class AccountIconsHelper
@@ -73,11 +73,12 @@ class AccountActionsHelper extends HelperBase
     /**
      * Set icons for view
      *
-     * @param AccountAcl        $accountAcl
-     * @param AccountActionsDto $accountActionsDto
+     * @param \SP\Services\Account\AccountAcl $accountAcl
+     * @param AccountActionsDto               $accountActionsDto
+     *
      * @return DataGridAction[]
      */
-    public function getActionsForAccount(AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
+    public function getActionsForAccount(\SP\Services\Account\AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
     {
         $actions = [];
 
@@ -248,8 +249,9 @@ class AccountActionsHelper extends HelperBase
     /**
      * Set icons for view
      *
-     * @param AccountAcl        $accountAcl
-     * @param AccountActionsDto $accountActionsDto
+     * @param \SP\Services\Account\AccountAcl $accountAcl
+     * @param AccountActionsDto               $accountActionsDto
+     *
      * @return DataGridAction[]
      */
     public function getActionsGrouppedForAccount(AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
@@ -417,7 +419,7 @@ class AccountActionsHelper extends HelperBase
         $action->setTitle(__('Ver Clave'));
         $action->addClass('btn-action');
         $action->setIcon($this->icons->getIconViewPass());
-        $action->setRuntimeFilter(AccountSearchItem::class, 'isShowViewPass');
+        $action->setRuntimeFilter(\SP\Services\Account\AccountSearchItem::class, 'isShowViewPass');
         $action->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNT_VIEW_PASS));
         $action->addData('action-full', 1);
         $action->addData('action-sk', $this->sk);
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
index ad376079..fe906f94 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
@@ -24,7 +24,6 @@
 
 namespace SP\Modules\Web\Controllers\Helpers\Account;
 
-use SP\Account\AccountAcl;
 use SP\Core\Acl\AccountPermissionException;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
@@ -37,6 +36,7 @@ use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Modules\Web\Controllers\Traits\ItemTrait;
 use SP\Mvc\View\Components\SelectItemAdapter;
 use SP\Repositories\NoSuchItemException;
+use SP\Services\Account\AccountAcl;
 use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountHistoryService;
 use SP\Services\Account\AccountService;
@@ -79,7 +79,7 @@ class AccountHelper extends HelperBase
      */
     private $actionId;
     /**
-     * @var AccountAcl
+     * @var \SP\Services\Account\AccountAcl
      */
     private $accountAcl;
     /**
@@ -212,7 +212,7 @@ class AccountHelper extends HelperBase
      *
      * @param AccountDetailsResponse $accountDetailsResponse
      *
-     * @return AccountAcl
+     * @return \SP\Services\Account\AccountAcl
      * @throws AccountPermissionException
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
@@ -297,7 +297,7 @@ class AccountHelper extends HelperBase
     public function setViewForBlank($actionId)
     {
         $this->actionId = $actionId;
-        $this->accountAcl = new AccountAcl($actionId);
+        $this->accountAcl = new \SP\Services\Account\AccountAcl($actionId);
 
         $this->checkActionAccess();
 
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
index 767af039..640f9ff9 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
@@ -24,7 +24,6 @@
 
 namespace SP\Modules\Web\Controllers\Helpers\Account;
 
-use SP\Account\AccountAcl;
 use SP\Core\Acl\AccountPermissionException;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\UnauthorizedPageException;
@@ -33,6 +32,7 @@ use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountAclDto;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Mvc\View\Components\SelectItemAdapter;
+use SP\Services\Account\AccountAcl;
 use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountHistoryService;
 use SP\Services\Category\CategoryService;
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
index 04bb620e..eaa3298b 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
@@ -24,8 +24,6 @@
 
 namespace SP\Modules\Web\Controllers\Helpers\Account;
 
-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountSearchItem;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
 use SP\Html\DataGrid\DataGrid;
@@ -37,6 +35,8 @@ use SP\Html\DataGrid\DataGridPager;
 use SP\Html\DataGrid\DataGridSort;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Mvc\View\Components\SelectItemAdapter;
+use SP\Services\Account\AccountSearchFilter;
+use SP\Services\Account\AccountSearchItem;
 use SP\Services\Account\AccountSearchService;
 use SP\Services\Category\CategoryService;
 use SP\Services\Client\ClientService;
@@ -66,7 +66,7 @@ class AccountSearchHelper extends HelperBase
      */
     private $isAjax = false;
     /**
-     * @var  AccountSearchFilter
+     * @var  \SP\Services\Account\AccountSearchFilter
      */
     private $accountSearchFilter;
 
@@ -118,13 +118,13 @@ class AccountSearchHelper extends HelperBase
 
         AccountSearchItem::$accountLink = $userPreferences->isAccountLink();
         AccountSearchItem::$topNavbar = $userPreferences->isTopNavbar();
-        AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions();
+        \SP\Services\Account\AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions();
         AccountSearchItem::$wikiEnabled = $this->configData->isWikiEnabled();
         AccountSearchItem::$dokuWikiEnabled = $this->configData->isDokuwikiEnabled();
-        AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled();
+        \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled();
         AccountSearchItem::$isDemoMode = $this->configData->isDemoEnabled();
 
-        if (AccountSearchItem::$wikiEnabled) {
+        if (\SP\Services\Account\AccountSearchItem::$wikiEnabled) {
             $wikiFilter = array_map(function ($value) {
                 return preg_quote($value, '/');
             }, $this->configData->getWikiFilter());
@@ -213,35 +213,35 @@ class AccountSearchHelper extends HelperBase
         $GridSortCustomer = new DataGridSort();
         $GridSortCustomer->setName(__('Cliente'))
             ->setTitle(__('Ordenar por Cliente'))
-            ->setSortKey(AccountSearchFilter::SORT_CLIENT)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CLIENT)
             ->setIconUp($icons->getIconUp())
             ->setIconDown($icons->getIconDown());
 
         $GridSortName = new DataGridSort();
         $GridSortName->setName(__('Nombre'))
             ->setTitle(__('Ordenar por Nombre'))
-            ->setSortKey(AccountSearchFilter::SORT_NAME)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_NAME)
             ->setIconUp($icons->getIconUp())
             ->setIconDown($icons->getIconDown());
 
         $GridSortCategory = new DataGridSort();
         $GridSortCategory->setName(__('Categoría'))
             ->setTitle(__('Ordenar por Categoría'))
-            ->setSortKey(AccountSearchFilter::SORT_CATEGORY)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CATEGORY)
             ->setIconUp($icons->getIconUp())
             ->setIconDown($icons->getIconDown());
 
         $GridSortLogin = new DataGridSort();
         $GridSortLogin->setName(__('Usuario'))
             ->setTitle(__('Ordenar por Usuario'))
-            ->setSortKey(AccountSearchFilter::SORT_LOGIN)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_LOGIN)
             ->setIconUp($icons->getIconUp())
             ->setIconDown($icons->getIconDown());
 
         $GridSortUrl = new DataGridSort();
         $GridSortUrl->setName(__('URL / IP'))
             ->setTitle(__('Ordenar por URL / IP'))
-            ->setSortKey(AccountSearchFilter::SORT_URL)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_URL)
             ->setIconUp($icons->getIconUp())
             ->setIconDown($icons->getIconDown());
 
@@ -297,7 +297,7 @@ class AccountSearchHelper extends HelperBase
     /**
      * Set search filters
      *
-     * @return AccountSearchFilter
+     * @return \SP\Services\Account\AccountSearchFilter
      */
     private function getFilters()
     {
diff --git a/app/modules/web/Controllers/UserController.php b/app/modules/web/Controllers/UserController.php
index 56c46fa4..25fb4c06 100644
--- a/app/modules/web/Controllers/UserController.php
+++ b/app/modules/web/Controllers/UserController.php
@@ -36,7 +36,7 @@ use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Modules\Web\Forms\UserForm;
 use SP\Mvc\Controller\CrudControllerInterface;
 use SP\Mvc\View\Components\SelectItemAdapter;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Services\UserPassRecover\UserPassRecoverService;
diff --git a/app/modules/web/Controllers/UserPassResetController.php b/app/modules/web/Controllers/UserPassResetController.php
index c90a8091..dc7480d6 100644
--- a/app/modules/web/Controllers/UserPassResetController.php
+++ b/app/modules/web/Controllers/UserPassResetController.php
@@ -32,7 +32,7 @@ use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Repositories\Track\TrackRequest;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SP\Services\Track\TrackService;
 use SP\Services\User\UserService;
 use SP\Services\UserPassRecover\UserPassRecoverService;
diff --git a/app/modules/web/Forms/AccountForm.php b/app/modules/web/Forms/AccountForm.php
index ecf2e4bb..da7b2668 100644
--- a/app/modules/web/Forms/AccountForm.php
+++ b/app/modules/web/Forms/AccountForm.php
@@ -24,9 +24,9 @@
 
 namespace SP\Modules\Web\Forms;
 
-use SP\Account\AccountRequest;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ValidationException;
+use SP\Services\Account\AccountRequest;
 
 /**
  * Class AccountForm
@@ -44,6 +44,7 @@ class AccountForm extends FormBase implements FormInterface
      * Validar el formulario
      *
      * @param $action
+     *
      * @return bool
      * @throws \SP\Core\Exceptions\ValidationException
      */
diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php
index 5f330771..1c0dd4a9 100644
--- a/app/modules/web/Init.php
+++ b/app/modules/web/Init.php
@@ -42,7 +42,7 @@ use SP\Services\Upgrade\UpgradeDatabaseService;
 use SP\Services\Upgrade\UpgradeUtil;
 use SP\Services\UserProfile\UserProfileService;
 use SP\Storage\Database\Database;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Util\HttpUtil;
 
 /**
@@ -163,7 +163,7 @@ class Init extends ModuleBase
             }
 
             // Checks if the database is set up
-            if (!DBUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName())) {
+            if (!DatabaseUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName())) {
                 $this->router->response()
                     ->redirect('index.php?r=error/databaseError')
                     ->send();
diff --git a/app/modules/web/themes/material-blue/views/account/account-history.inc b/app/modules/web/themes/material-blue/views/account/account-history.inc
index e5aeda1e..7acec6d8 100644
--- a/app/modules/web/themes/material-blue/views/account/account-history.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-history.inc
@@ -1,5 +1,5 @@
 <?php
-/** @var \SP\Account\AccountAcl $accountAcl */
+/** @var \SP\Services\Account\AccountAcl $accountAcl */
 /** @var \SP\DataModel\AccountHistoryData $accountData */
 /** @var \SP\Mvc\View\Template $this */
 ?>
diff --git a/app/modules/web/themes/material-blue/views/account/account-permissions.inc b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
index 955dd773..d03a5ea5 100644
--- a/app/modules/web/themes/material-blue/views/account/account-permissions.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl       $accountAcl
- * @var \SP\DataModel\AccountExtData $accountData
- * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Core\UI\ThemeIcons          $icons
  */
 ?>
 
diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc
index 840833d5..b74a6ab6 100644
--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl $accountAcl
- * @var \SP\DataModel\AccountExtData $accountData
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Config\ConfigData           $configData
  */
 
 $showLinked = $gotData && count($linkedAccounts) > 0;
diff --git a/app/modules/web/themes/material-blue/views/account/details.inc b/app/modules/web/themes/material-blue/views/account/details.inc
index 6f4ea532..e92b24bf 100644
--- a/app/modules/web/themes/material-blue/views/account/details.inc
+++ b/app/modules/web/themes/material-blue/views/account/details.inc
@@ -1,5 +1,5 @@
 <?php
-/** @var \SP\Account\AccountAcl $AccountAcl */
+/** @var \SP\Services\Account\AccountAcl $AccountAcl */
 /** @var \SP\DataModel\AccountExtData $accountData */
 ?>
 
diff --git a/app/modules/web/themes/material-blue/views/account/files.inc b/app/modules/web/themes/material-blue/views/account/files.inc
index ec6e662a..d77ca557 100644
--- a/app/modules/web/themes/material-blue/views/account/files.inc
+++ b/app/modules/web/themes/material-blue/views/account/files.inc
@@ -1,7 +1,7 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl $accountAcl
- * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Core\UI\ThemeIcons          $icons
  */
 ?>
 
diff --git a/app/modules/web/themes/material-blue/views/account/search-header.inc b/app/modules/web/themes/material-blue/views/account/search-header.inc
index 47603027..1fa222f6 100644
--- a/app/modules/web/themes/material-blue/views/account/search-header.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-header.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
  * @var $this    \SP\Mvc\View\Template
  */
 ?>
diff --git a/app/modules/web/themes/material-blue/views/account/search-index.inc b/app/modules/web/themes/material-blue/views/account/search-index.inc
index 1018070f..2f5059f4 100644
--- a/app/modules/web/themes/material-blue/views/account/search-index.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-index.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
  * @var $this    \SP\Mvc\View\Template
  */
 ?>
@@ -15,7 +15,7 @@
             <?php include $data->getDataHeaderTemplate(); ?>
         </div>
 
-        <?php if (\SP\Account\AccountSearchItem::$topNavbar): ?>
+        <?php if (\SP\Services\Account\AccountSearchItem::$topNavbar): ?>
             <!-- Data Pager -->
             <div id="search-pager-top">
                 <?php include $data->getDataPagerTemplate(); ?>
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
index df120200..df1d1630 100644
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var $data              \SP\Html\DataGrid\DataGridTab
- * @var $accountSearchItem \SP\Account\AccountSearchItem
+ * @var $accountSearchItem \SP\Services\Account\AccountSearchItem
  * @var $this              \SP\Mvc\View\Template
  * @var $action            \SP\Html\DataGrid\DataGridActionBase
  * @var $actionMenu        \SP\Html\DataGrid\DataGridActionBase
@@ -189,7 +189,7 @@
 
                         <?php if (isset($wikiFilter)): ?>
                             <?php if (preg_match('/^(' . $wikiFilter . ').*/i', $accountSearchData->getName())): ?>
-                                <?php if (\SP\Account\AccountSearchItem::$dokuWikiEnabled): ?>
+                                <?php if (\SP\Services\Account\AccountSearchItem::$dokuWikiEnabled): ?>
                                     <a href="<?php echo $wikiPageUrl, $accountSearchData->getName(); ?>"
                                        target="_blank">
                                         <i class="material-icons"
diff --git a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
index 86048efd..113c882f 100644
--- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
  * @var $this    \SP\Mvc\View\Template
  * @var $icons   \SP\Core\UI\ThemeIcons
  */
diff --git a/lib/Definitions.php b/lib/Definitions.php
index 28ddca75..44b14f3b 100644
--- a/lib/Definitions.php
+++ b/lib/Definitions.php
@@ -37,8 +37,8 @@ return [
         }
     },
     \SP\Config\Config::class => object(\SP\Config\Config::class)
-        ->constructor(object(\SP\Storage\XmlHandler::class)
-            ->constructor(object(\SP\Storage\FileHandler::class)
+        ->constructor(object(\SP\Storage\File\XmlHandler::class)
+            ->constructor(object(\SP\Storage\File\FileHandler::class)
                 ->constructor(CONFIG_FILE)), get(\SP\Core\Context\ContextInterface::class)),
     \SP\Core\Language::class => object(\SP\Core\Language::class),
     \SP\Config\ConfigData::class => function (\SP\Config\Config $config) {
@@ -51,8 +51,8 @@ return [
         ->constructor(object(\SP\Storage\Database\MySQLHandler::class)
             ->constructor(get(\SP\Storage\Database\DatabaseConnectionData::class))),
     \SP\Core\Acl\Actions::class => object(\SP\Core\Acl\Actions::class)
-        ->constructor(object(\SP\Storage\FileCache::class), object(\SP\Storage\XmlHandler::class)
-            ->constructor(object(\SP\Storage\FileHandler::class)
+        ->constructor(object(\SP\Storage\File\FileCache::class), object(\SP\Storage\File\XmlHandler::class)
+            ->constructor(object(\SP\Storage\File\FileHandler::class)
                 ->constructor(ACTIONS_FILE))),
     \SP\Core\Events\EventDispatcher::class => object(\SP\Core\Events\EventDispatcher::class),
     \SP\Core\Acl\Acl::class => object(\SP\Core\Acl\Acl::class)
diff --git a/lib/SP/Bootstrap.php b/lib/SP/Bootstrap.php
index 436f4b8b..5a10774b 100644
--- a/lib/SP/Bootstrap.php
+++ b/lib/SP/Bootstrap.php
@@ -55,7 +55,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class Bootstrap
+final class Bootstrap
 {
     /**
      * @var string The installation path on the server (e.g. /srv/www/syspass)
diff --git a/lib/SP/Config/Config.php b/lib/SP/Config/Config.php
index 5040b4ef..4dabd0c3 100644
--- a/lib/SP/Config/Config.php
+++ b/lib/SP/Config/Config.php
@@ -29,8 +29,8 @@ use ReflectionObject;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\ConfigException;
 use SP\Services\Config\ConfigBackupService;
-use SP\Storage\FileException;
-use SP\Storage\XmlFileStorageInterface;
+use SP\Storage\File\FileException;
+use SP\Storage\File\XmlFileStorageInterface;
 use SP\Util\Util;
 
 defined('APP_ROOT') || die();
@@ -38,7 +38,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es responsable de leer y escribir la configuración del archivo config.php
  */
-class Config
+final class Config
 {
     /**
      * @var int
@@ -53,7 +53,7 @@ class Config
      */
     private $configData;
     /**
-     * @var XmlFileStorageInterface
+     * @var \SP\Storage\File\XmlFileStorageInterface
      */
     private $fileStorage;
     /**
@@ -68,9 +68,9 @@ class Config
     /**
      * Config constructor.
      *
-     * @param XmlFileStorageInterface $fileStorage
-     * @param ContextInterface        $session
-     * @param Container               $dic
+     * @param \SP\Storage\File\XmlFileStorageInterface $fileStorage
+     * @param ContextInterface                         $session
+     * @param Container                                $dic
      *
      * @throws ConfigException
      */
diff --git a/lib/SP/Config/ConfigCache.php b/lib/SP/Config/ConfigCache.php
index 5bfcef1e..f78a5561 100644
--- a/lib/SP/Config/ConfigCache.php
+++ b/lib/SP/Config/ConfigCache.php
@@ -24,15 +24,15 @@
 
 namespace SP\Config;
 
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;
 
 /**
  * Class ConfigCache
  *
  * @package SP\Config
  */
-class ConfigCache
+final class ConfigCache
 {
     /**
      * Cache file name
diff --git a/lib/SP/Config/ConfigData.php b/lib/SP/Config/ConfigData.php
index 6036c1f3..b0a61203 100644
--- a/lib/SP/Config/ConfigData.php
+++ b/lib/SP/Config/ConfigData.php
@@ -31,7 +31,7 @@ use JsonSerializable;
  *
  * @package SP\Config
  */
-class ConfigData implements JsonSerializable
+final class ConfigData implements JsonSerializable
 {
     /**
      * @var string
@@ -416,6 +416,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $dokuwikiEnabled
+     *
      * @return $this
      */
     public function setDokuwikiEnabled($dokuwikiEnabled)
@@ -435,6 +436,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dokuwikiUrl
+     *
      * @return $this
      */
     public function setDokuwikiUrl($dokuwikiUrl)
@@ -454,6 +456,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dokuwikiUrlBase
+     *
      * @return $this
      */
     public function setDokuwikiUrlBase($dokuwikiUrlBase)
@@ -473,6 +476,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dokuwikiUser
+     *
      * @return $this
      */
     public function setDokuwikiUser($dokuwikiUser)
@@ -492,6 +496,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dokuwikiPass
+     *
      * @return $this
      */
     public function setDokuwikiPass($dokuwikiPass)
@@ -511,6 +516,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dokuwikiNamespace
+     *
      * @return $this
      */
     public function setDokuwikiNamespace($dokuwikiNamespace)
@@ -530,6 +536,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $ldapDefaultGroup
+     *
      * @return $this
      */
     public function setLdapDefaultGroup($ldapDefaultGroup)
@@ -549,6 +556,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $ldapDefaultProfile
+     *
      * @return $this
      */
     public function setLdapDefaultProfile($ldapDefaultProfile)
@@ -568,6 +576,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $proxyEnabled
+     *
      * @return $this
      */
     public function setProxyEnabled($proxyEnabled)
@@ -587,6 +596,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $proxyServer
+     *
      * @return $this
      */
     public function setProxyServer($proxyServer)
@@ -606,6 +616,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $proxyPort
+     *
      * @return $this
      */
     public function setProxyPort($proxyPort)
@@ -625,6 +636,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $proxyUser
+     *
      * @return $this
      */
     public function setProxyUser($proxyUser)
@@ -644,6 +656,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $proxyPass
+     *
      * @return $this
      */
     public function setProxyPass($proxyPass)
@@ -664,6 +677,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $publinksMaxViews
+     *
      * @return $this
      */
     public function setPublinksMaxViews($publinksMaxViews)
@@ -683,6 +697,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $publinksMaxTime
+     *
      * @return $this
      */
     public function setPublinksMaxTime($publinksMaxTime)
@@ -702,6 +717,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $syslogEnabled
+     *
      * @return $this
      */
     public function setSyslogEnabled($syslogEnabled)
@@ -721,6 +737,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $syslogRemoteEnabled
+     *
      * @return $this
      */
     public function setSyslogRemoteEnabled($syslogRemoteEnabled)
@@ -740,6 +757,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $syslogServer
+     *
      * @return $this
      */
     public function setSyslogServer($syslogServer)
@@ -759,6 +777,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $syslogPort
+     *
      * @return $this
      */
     public function setSyslogPort($syslogPort)
@@ -778,6 +797,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $backup_hash
+     *
      * @return $this
      */
     public function setBackupHash($backup_hash)
@@ -797,6 +817,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $export_hash
+     *
      * @return $this
      */
     public function setExportHash($export_hash)
@@ -816,6 +837,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapBindUser
+     *
      * @return $this
      */
     public function setLdapBindUser($ldapBindUser)
@@ -835,6 +857,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapProxyUser
+     *
      * @return $this
      */
     public function setLdapProxyUser($ldapProxyUser)
@@ -854,6 +877,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $accountCount
+     *
      * @return $this
      */
     public function setAccountCount($accountCount)
@@ -873,6 +897,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $accountLink
+     *
      * @return $this
      */
     public function setAccountLink($accountLink)
@@ -892,6 +917,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $checkUpdates
+     *
      * @return $this
      */
     public function setCheckUpdates($checkUpdates)
@@ -929,6 +955,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dbHost
+     *
      * @return $this
      */
     public function setDbHost($dbHost)
@@ -948,6 +975,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dbName
+     *
      * @return $this
      */
     public function setDbName($dbName)
@@ -967,6 +995,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dbPass
+     *
      * @return $this
      */
     public function setDbPass($dbPass)
@@ -986,6 +1015,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $dbUser
+     *
      * @return $this
      */
     public function setDbUser($dbUser)
@@ -1005,6 +1035,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $debug
+     *
      * @return $this
      */
     public function setDebug($debug)
@@ -1024,6 +1055,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $demoEnabled
+     *
      * @return $this
      */
     public function setDemoEnabled($demoEnabled)
@@ -1043,6 +1075,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param array $filesAllowedExts
+     *
      * @return $this
      */
     public function setFilesAllowedExts(array $filesAllowedExts = [])
@@ -1062,6 +1095,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $filesAllowedSize
+     *
      * @return $this
      */
     public function setFilesAllowedSize($filesAllowedSize)
@@ -1081,6 +1115,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $filesEnabled
+     *
      * @return $this
      */
     public function setFilesEnabled($filesEnabled)
@@ -1100,6 +1135,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $globalSearch
+     *
      * @return $this
      */
     public function setGlobalSearch($globalSearch)
@@ -1119,6 +1155,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $installed
+     *
      * @return $this
      */
     public function setInstalled($installed)
@@ -1138,6 +1175,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapBase
+     *
      * @return $this
      */
     public function setLdapBase($ldapBase)
@@ -1157,6 +1195,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $ldapEnabled
+     *
      * @return $this
      */
     public function setLdapEnabled($ldapEnabled)
@@ -1176,6 +1215,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapGroup
+     *
      * @return $this
      */
     public function setLdapGroup($ldapGroup)
@@ -1195,6 +1235,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapServer
+     *
      * @return $this
      */
     public function setLdapServer($ldapServer)
@@ -1214,6 +1255,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapUserattr
+     *
      * @return $this
      */
     public function setLdapUserattr($ldapUserattr)
@@ -1233,6 +1275,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $logEnabled
+     *
      * @return $this
      */
     public function setLogEnabled($logEnabled)
@@ -1252,6 +1295,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $mailAuthenabled
+     *
      * @return $this
      */
     public function setMailAuthenabled($mailAuthenabled)
@@ -1271,6 +1315,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $mailEnabled
+     *
      * @return $this
      */
     public function setMailEnabled($mailEnabled)
@@ -1290,6 +1335,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $mailFrom
+     *
      * @return $this
      */
     public function setMailFrom($mailFrom)
@@ -1309,6 +1355,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $mailPass
+     *
      * @return $this
      */
     public function setMailPass($mailPass)
@@ -1328,6 +1375,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $mailPort
+     *
      * @return $this
      */
     public function setMailPort($mailPort)
@@ -1347,6 +1395,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $mailRequestsEnabled
+     *
      * @return $this
      */
     public function setMailRequestsEnabled($mailRequestsEnabled)
@@ -1366,6 +1415,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $mailSecurity
+     *
      * @return $this
      */
     public function setMailSecurity($mailSecurity)
@@ -1385,6 +1435,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $mailServer
+     *
      * @return $this
      */
     public function setMailServer($mailServer)
@@ -1404,6 +1455,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $mailUser
+     *
      * @return $this
      */
     public function setMailUser($mailUser)
@@ -1423,6 +1475,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $maintenance
+     *
      * @return $this
      */
     public function setMaintenance($maintenance)
@@ -1442,6 +1495,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $passwordSalt
+     *
      * @return $this
      */
     public function setPasswordSalt($passwordSalt)
@@ -1461,6 +1515,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $resultsAsCards
+     *
      * @return $this
      */
     public function setResultsAsCards($resultsAsCards)
@@ -1480,6 +1535,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $sessionTimeout
+     *
      * @return $this
      */
     public function setSessionTimeout($sessionTimeout)
@@ -1499,6 +1555,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $siteLang
+     *
      * @return $this
      */
     public function setSiteLang($siteLang)
@@ -1518,6 +1575,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $siteTheme
+     *
      * @return $this
      */
     public function setSiteTheme($siteTheme)
@@ -1537,6 +1595,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $configVersion
+     *
      * @return $this
      */
     public function setConfigVersion($configVersion)
@@ -1556,6 +1615,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $wikiEnabled
+     *
      * @return $this
      */
     public function setWikiEnabled($wikiEnabled)
@@ -1575,6 +1635,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param array $wikiFilter
+     *
      * @return $this
      */
     public function setWikiFilter($wikiFilter)
@@ -1594,6 +1655,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $wikiPageurl
+     *
      * @return $this
      */
     public function setWikiPageurl($wikiPageurl)
@@ -1613,6 +1675,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $wikiSearchurl
+     *
      * @return $this
      */
     public function setWikiSearchurl($wikiSearchurl)
@@ -1632,6 +1695,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $ldapAds
+     *
      * @return $this
      */
     public function setLdapAds($ldapAds)
@@ -1651,6 +1715,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $ldapBindPass
+     *
      * @return $this
      */
     public function setLdapBindPass($ldapBindPass)
@@ -1670,6 +1735,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $publinksImageEnabled
+     *
      * @return $this
      */
     public function setPublinksImageEnabled($publinksImageEnabled)
@@ -1689,6 +1755,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $httpsEnabled
+     *
      * @return $this
      */
     public function setHttpsEnabled($httpsEnabled)
@@ -1708,6 +1775,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $checknotices
+     *
      * @return $this
      */
     public function setChecknotices($checknotices)
@@ -1727,6 +1795,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $accountPassToImage
+     *
      * @return $this
      */
     public function setAccountPassToImage($accountPassToImage)
@@ -1746,6 +1815,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $upgradeKey
+     *
      * @return $this
      */
     public function setUpgradeKey($upgradeKey)
@@ -1765,6 +1835,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $dbPort
+     *
      * @return $this
      */
     public function setDbPort($dbPort)
@@ -1784,6 +1855,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param boolean $publinksEnabled
+     *
      * @return $this
      */
     public function setPublinksEnabled($publinksEnabled)
@@ -1816,6 +1888,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $configSaver
+     *
      * @return $this
      */
     public function setConfigSaver($configSaver)
@@ -1851,6 +1924,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param bool $encryptSession
+     *
      * @return $this
      */
     public function setEncryptSession($encryptSession)
@@ -1870,6 +1944,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param bool $accountFullGroupAccess
+     *
      * @return $this
      */
     public function setAccountFullGroupAccess($accountFullGroupAccess)
@@ -2001,6 +2076,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param string $databaseVersion
+     *
      * @return ConfigData
      */
     public function setDatabaseVersion($databaseVersion)
@@ -2020,6 +2096,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $configDate
+     *
      * @return $this
      */
     public function setConfigDate($configDate)
@@ -2039,6 +2116,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param bool $accountExpireEnabled
+     *
      * @return ConfigData
      */
     public function setAccountExpireEnabled($accountExpireEnabled)
@@ -2058,6 +2136,7 @@ class ConfigData implements JsonSerializable
 
     /**
      * @param int $accountExpireTime
+     *
      * @return ConfigData
      */
     public function setAccountExpireTime($accountExpireTime)
diff --git a/lib/SP/Config/ConfigInterface.php b/lib/SP/Config/ConfigInterface.php
index b05fe32f..90520568 100644
--- a/lib/SP/Config/ConfigInterface.php
+++ b/lib/SP/Config/ConfigInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -38,6 +38,7 @@ interface ConfigInterface
      *
      * @param string $param   El valor a obtener
      * @param string $default El valor por defecto
+     *
      * @return string el valor o $default
      */
     public static function getValue($param, $default = null);
@@ -45,10 +46,11 @@ interface ConfigInterface
     /**
      * Guardar un parámetro de configuración
      *
-     * @param string $param El parámetro a guardar
-     * @param string $value El valor a guardar
-     * @param bool   $email enviar email?
+     * @param string $param     El parámetro a guardar
+     * @param string $value     El valor a guardar
+     * @param bool   $email     enviar email?
      * @param bool   $hideValue Ocultar el valor del registro en el log
+     *
      * @return bool
      */
     public static function setValue($param, $value, $email = true, $hideValue = false);
@@ -57,6 +59,7 @@ interface ConfigInterface
      * Elimina un parámetro de la configuración.
      *
      * @param string $param clave
+     *
      * @return bool
      */
     public static function deleteParam($param);
diff --git a/lib/SP/Config/ConfigUtil.php b/lib/SP/Config/ConfigUtil.php
index 9c8ddeab..ef49f4b9 100644
--- a/lib/SP/Config/ConfigUtil.php
+++ b/lib/SP/Config/ConfigUtil.php
@@ -32,12 +32,13 @@ use SP\Util\Checks;
  *
  * @package Config
  */
-class ConfigUtil
+final class ConfigUtil
 {
     /**
      * Adaptador para convertir una cadena de extensiones a un array
      *
      * @param string $filesAllowedExts
+     *
      * @return array
      */
     public static function filesExtsAdapter($filesAllowedExts)
@@ -55,6 +56,7 @@ class ConfigUtil
      * Adaptador para convertir una cadena de direcciones de email a un array
      *
      * @param string $mailAddresses
+     *
      * @return array
      */
     public static function mailAddressesAdapter($mailAddresses)
@@ -68,6 +70,7 @@ class ConfigUtil
      * Adaptador para convertir una cadena de eventos a un array
      *
      * @param array $events
+     *
      * @return array
      */
     public static function eventsAdapter(array $events)
diff --git a/lib/SP/Core/Acl/AccountPermissionException.php b/lib/SP/Core/Acl/AccountPermissionException.php
index 965cb5a9..cfccc40e 100644
--- a/lib/SP/Core/Acl/AccountPermissionException.php
+++ b/lib/SP/Core/Acl/AccountPermissionException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Core\Acl
  */
-class AccountPermissionException extends SPException
+final class AccountPermissionException extends SPException
 {
     /**
      * SPException constructor.
diff --git a/lib/SP/Core/Acl/Acl.php b/lib/SP/Core/Acl/Acl.php
index 989223d3..f2aecd50 100644
--- a/lib/SP/Core/Acl/Acl.php
+++ b/lib/SP/Core/Acl/Acl.php
@@ -36,7 +36,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de calcular las access lists de acceso a usuarios.
  */
-class Acl implements ActionsInterface
+final class Acl implements ActionsInterface
 {
     /**
      * @var Actions
diff --git a/lib/SP/Core/Acl/ActionNotFoundException.php b/lib/SP/Core/Acl/ActionNotFoundException.php
index adb0291f..d5ac7e93 100644
--- a/lib/SP/Core/Acl/ActionNotFoundException.php
+++ b/lib/SP/Core/Acl/ActionNotFoundException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Core\Acl
  */
-class ActionNotFoundException extends SPException
+final class ActionNotFoundException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Acl/Actions.php b/lib/SP/Core/Acl/Actions.php
index 07091f12..79fb46a9 100644
--- a/lib/SP/Core/Acl/Actions.php
+++ b/lib/SP/Core/Acl/Actions.php
@@ -25,16 +25,16 @@
 namespace SP\Core\Acl;
 
 use SP\DataModel\ActionData;
-use SP\Storage\FileException;
-use SP\Storage\FileStorageInterface;
-use SP\Storage\XmlFileStorageInterface;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileStorageInterface;
+use SP\Storage\File\XmlFileStorageInterface;
 
 /**
  * Class Actions
  *
  * @package SP\Core\Acl
  */
-class Actions
+final class Actions
 {
     /**
      * Cache file name
@@ -53,7 +53,7 @@ class Actions
      */
     protected $actions;
     /**
-     * @var XmlFileStorageInterface
+     * @var \SP\Storage\File\XmlFileStorageInterface
      */
     protected $xmlFileStorage;
     /**
@@ -64,8 +64,8 @@ class Actions
     /**
      * Action constructor.
      *
-     * @param FileStorageInterface    $fileStorage
-     * @param XmlFileStorageInterface $xmlFileStorage
+     * @param FileStorageInterface                     $fileStorage
+     * @param \SP\Storage\File\XmlFileStorageInterface $xmlFileStorage
      *
      * @throws \SP\Core\Exceptions\FileNotFoundException
      */
diff --git a/lib/SP/Core/Acl/UnauthorizedPageException.php b/lib/SP/Core/Acl/UnauthorizedPageException.php
index a887bcc0..3d5d03ac 100644
--- a/lib/SP/Core/Acl/UnauthorizedPageException.php
+++ b/lib/SP/Core/Acl/UnauthorizedPageException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Core\Acl
  */
-class UnauthorizedPageException extends SPException
+final class UnauthorizedPageException extends SPException
 {
     /**
      * SPException constructor.
diff --git a/lib/SP/Core/Context/ContextCollection.php b/lib/SP/Core/Context/ContextCollection.php
index 6749715b..612c34ed 100644
--- a/lib/SP/Core/Context/ContextCollection.php
+++ b/lib/SP/Core/Context/ContextCollection.php
@@ -31,7 +31,7 @@ use SP\Core\DataCollection;
  *
  * @package SP\Core\Context
  */
-class ContextCollection extends DataCollection
+final class ContextCollection extends DataCollection
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Context/ContextException.php b/lib/SP/Core/Context/ContextException.php
index 759fc913..5a41a379 100644
--- a/lib/SP/Core/Context/ContextException.php
+++ b/lib/SP/Core/Context/ContextException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Core\Context
  */
-class ContextException extends SPException
+final class ContextException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Context/SessionContext.php b/lib/SP/Core/Context/SessionContext.php
index 06d6dad6..00e4a494 100644
--- a/lib/SP/Core/Context/SessionContext.php
+++ b/lib/SP/Core/Context/SessionContext.php
@@ -24,11 +24,11 @@
 
 namespace SP\Core\Context;
 
-use SP\Account\AccountSearchFilter;
 use SP\Config\ConfigData;
 use SP\Core\Crypt\Vault;
 use SP\DataModel\Dto\AccountCache;
 use SP\DataModel\ProfileData;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\User\UserLoginResponse;
 
 /**
@@ -36,7 +36,7 @@ use SP\Services\User\UserLoginResponse;
  *
  * @package SP\Core\Session
  */
-class SessionContext extends ContextBase
+final class SessionContext extends ContextBase
 {
     private static $isReset = false;
     private static $isLocked = false;
diff --git a/lib/SP/Core/Context/StatelessContext.php b/lib/SP/Core/Context/StatelessContext.php
index 9a78858e..c4c55fea 100644
--- a/lib/SP/Core/Context/StatelessContext.php
+++ b/lib/SP/Core/Context/StatelessContext.php
@@ -33,7 +33,7 @@ use SP\Services\User\UserLoginResponse;
  *
  * @package SP\Core\Context
  */
-class StatelessContext extends ContextBase
+final class StatelessContext extends ContextBase
 {
     /**
      * Establecer la configuración
diff --git a/lib/SP/Core/Crypt/Cookie.php b/lib/SP/Core/Crypt/Cookie.php
index 862a0fa0..cb1d53d2 100644
--- a/lib/SP/Core/Crypt/Cookie.php
+++ b/lib/SP/Core/Crypt/Cookie.php
@@ -60,6 +60,7 @@ abstract class Cookie
      *
      * @param string $data
      * @param string $cypher
+     *
      * @return string
      */
     protected final function sign($data, $cypher)
@@ -74,6 +75,7 @@ abstract class Cookie
      *
      * @param string $data
      * @param string $cypher
+     *
      * @return bool|string
      */
     protected final function getCookieData($data, $cypher)
@@ -101,6 +103,7 @@ abstract class Cookie
      * Sets cookie data
      *
      * @param $data
+     *
      * @return bool
      */
     protected function setCookie($data)
diff --git a/lib/SP/Core/Crypt/Crypt.php b/lib/SP/Core/Crypt/Crypt.php
index b7f4f627..4b269f78 100644
--- a/lib/SP/Core/Crypt/Crypt.php
+++ b/lib/SP/Core/Crypt/Crypt.php
@@ -34,7 +34,7 @@ use Defuse\Crypto\KeyProtectedByPassword;
  *
  * @package SP\Core\Crypt
  */
-class Crypt
+final class Crypt
 {
     /**
      * Encriptar datos con una clave segura
@@ -42,6 +42,7 @@ class Crypt
      * @param string     $data
      * @param string|Key $securedKey
      * @param string     $password
+     *
      * @return string
      * @throws CryptoException
      */
@@ -68,6 +69,7 @@ class Crypt
      * @param string $key
      * @param string $password
      * @param bool   $useAscii
+     *
      * @return string|Key
      * @throws CryptoException
      */
@@ -92,6 +94,7 @@ class Crypt
      * @param string                            $data
      * @param string|Key|KeyProtectedByPassword $securedKey
      * @param string                            $password
+     *
      * @return string
      * @throws CryptoException
      */
@@ -122,6 +125,7 @@ class Crypt
      *
      * @param string $password
      * @param bool   $useAscii
+     *
      * @return string|KeyProtectedByPassword
      * @throws CryptoException
      */
diff --git a/lib/SP/Core/Crypt/CryptPKI.php b/lib/SP/Core/Crypt/CryptPKI.php
index 6696a148..017b876d 100644
--- a/lib/SP/Core/Crypt/CryptPKI.php
+++ b/lib/SP/Core/Crypt/CryptPKI.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -35,7 +35,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP
  */
-class CryptPKI
+final class CryptPKI
 {
     /**
      * @var RSA
@@ -44,6 +44,7 @@ class CryptPKI
 
     /**
      * @param RSA $rsa
+     *
      * @throws SPException
      */
     public function __construct(RSA $rsa)
@@ -96,6 +97,7 @@ class CryptPKI
      * Encriptar datos con la clave pública
      *
      * @param string $data los datos a encriptar
+     *
      * @return string
      * @throws \SP\Core\Exceptions\FileNotFoundException
      */
@@ -128,6 +130,7 @@ class CryptPKI
      * Desencriptar datos cifrados con la clave pública
      *
      * @param string $data los datos a desencriptar
+     *
      * @return string
      * @throws \SP\Core\Exceptions\FileNotFoundException
      */
diff --git a/lib/SP/Core/Crypt/CryptSessionHandler.php b/lib/SP/Core/Crypt/CryptSessionHandler.php
index d0008320..171652e3 100644
--- a/lib/SP/Core/Crypt/CryptSessionHandler.php
+++ b/lib/SP/Core/Crypt/CryptSessionHandler.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -32,7 +32,7 @@ use Defuse\Crypto\Key;
  *
  * @package SP\Core\Crypt
  */
-class CryptSessionHandler extends \SessionHandler
+final class CryptSessionHandler extends \SessionHandler
 {
     /**
      * @var bool Indica si la sesión está encriptada
@@ -57,7 +57,9 @@ class CryptSessionHandler extends \SessionHandler
      * Read session data
      *
      * @link  http://php.net/manual/en/sessionhandler.read.php
-     * @param string $id         The session id to read data for.
+     *
+     * @param string $id The session id to read data for.
+     *
      * @return string <p>
      *                           Returns an encoded string of the read data.
      *                           If nothing was read, it must return an empty string.
@@ -91,6 +93,7 @@ class CryptSessionHandler extends \SessionHandler
      * Write session data
      *
      * @link  http://php.net/manual/en/sessionhandler.write.php
+     *
      * @param string $id           The session id.
      * @param string $data         <p>
      *                             The encoded session data. This data is the
@@ -99,6 +102,7 @@ class CryptSessionHandler extends \SessionHandler
      *                             string and passing it as this parameter.
      *                             Please note sessions use an alternative serialization method.
      *                             </p>
+     *
      * @return bool <p>
      *                             The return value (usually TRUE on success, FALSE on failure).
      *                             Note this value is returned internally to PHP for processing.
diff --git a/lib/SP/Core/Crypt/Hash.php b/lib/SP/Core/Crypt/Hash.php
index 93e65b24..59e5b617 100644
--- a/lib/SP/Core/Crypt/Hash.php
+++ b/lib/SP/Core/Crypt/Hash.php
@@ -29,7 +29,7 @@ namespace SP\Core\Crypt;
  *
  * @package SP\Core\Crypt
  */
-class Hash
+final class Hash
 {
     /**
      * Longitud máxima aceptada para hashing
@@ -41,6 +41,7 @@ class Hash
      *
      * @param string $key  con la clave a comprobar
      * @param string $hash con el hash a comprobar
+     *
      * @return bool
      */
     public static function checkHashKey($key, $hash)
@@ -53,6 +54,7 @@ class Hash
      *
      * @param string $key
      * @param bool   $isCheck Indica si la operación es de comprobación o no
+     *
      * @return string
      */
     private static function getKey(&$key, $isCheck = true)
@@ -72,6 +74,7 @@ class Hash
      * Generar un hash de una clave criptográficamente segura
      *
      * @param string $key con la clave a 'hashear'
+     *
      * @return string con el hash de la clave
      */
     public static function hashKey($key)
@@ -84,6 +87,7 @@ class Hash
      *
      * @param $message
      * @param $key
+     *
      * @return string
      */
     public static function signMessage($message, $key)
@@ -97,6 +101,7 @@ class Hash
      * @param $message
      * @param $key
      * @param $hash
+     *
      * @return bool
      */
     public static function checkMessage($message, $key, $hash)
diff --git a/lib/SP/Core/Crypt/OldCrypt.php b/lib/SP/Core/Crypt/OldCrypt.php
index df181304..e0137d47 100644
--- a/lib/SP/Core/Crypt/OldCrypt.php
+++ b/lib/SP/Core/Crypt/OldCrypt.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,8 +33,10 @@ defined('APP_ROOT') || die();
 
 /**
  * Esta clase es la encargada de realizar el encriptado/desencriptado de claves
+ *
+ * @deprecated Since 2.1
  */
-class OldCrypt
+final class OldCrypt
 {
     public static $strInitialVector;
 
@@ -43,6 +45,7 @@ class OldCrypt
      *
      * @param string $pwd        con la clave a 'hashear'
      * @param bool   $prefixSalt Añadir el salt al hash
+     *
      * @return string con el hash de la clave
      */
     public static function mkHashPassword($pwd, $prefixSalt = true)
@@ -58,6 +61,7 @@ class OldCrypt
      *
      * @param string $salt
      * @param bool   $random
+     *
      * @return string con el salt creado
      */
     public static function makeHashSalt($salt = null, $random = true)
@@ -116,7 +120,8 @@ class OldCrypt
      *
      * @param string $customPwd con la clave a encriptar
      * @param string $masterPwd con la clave maestra
-     * @return string con la clave encriptada
+     *
+     * @return array con la clave encriptada
      */
     public static function mkCustomMPassEncrypt($customPwd, $masterPwd)
     {
@@ -132,6 +137,7 @@ class OldCrypt
      * @param string $strValue    con los datos a encriptar
      * @param string $strPassword con la clave maestra
      * @param string $cryptIV     con el IV
+     *
      * @return string con los datos encriptados
      */
     private static function encrypt($strValue, $strPassword, $cryptIV)
@@ -154,6 +160,7 @@ class OldCrypt
      *
      * @param mixed  $data string Los datos a encriptar
      * @param string $pwd  La clave de encriptación
+     *
      * @return array
      * @throws SPException
      */
@@ -201,6 +208,7 @@ class OldCrypt
      *
      * @param string $data      con los datos a encriptar
      * @param string $masterPwd con la clave maestra
+     *
      * @return bool
      */
     public static function mkEncrypt($data, $masterPwd)
@@ -216,6 +224,7 @@ class OldCrypt
      * @param string $cryptData Los datos a desencriptar
      * @param string $cryptIV   con el IV
      * @param string $password  La clave maestra
+     *
      * @return string con los datos desencriptados
      */
     public static function getDecrypt($cryptData, $cryptIV, $password)
@@ -239,6 +248,7 @@ class OldCrypt
      *
      * @param string $string La cadena de la que deriva la key
      * @param null   $salt   El salt utilizado
+     *
      * @return string
      */
     public static function generateAesKey($string, $salt = null)
diff --git a/lib/SP/Core/Crypt/SecureKeyCookie.php b/lib/SP/Core/Crypt/SecureKeyCookie.php
index 0d0b930b..fbff805b 100644
--- a/lib/SP/Core/Crypt/SecureKeyCookie.php
+++ b/lib/SP/Core/Crypt/SecureKeyCookie.php
@@ -33,7 +33,7 @@ use SP\Http\Request;
  *
  * @package SP\Core\Crypt
  */
-class SecureKeyCookie extends Cookie
+final class SecureKeyCookie extends Cookie
 {
     /**
      * Nombre de la cookie
@@ -51,7 +51,8 @@ class SecureKeyCookie extends Cookie
      *
      * @return SecureKeyCookie
      */
-    public static function factory(Request $request) {
+    public static function factory(Request $request)
+    {
         return new self(self::COOKIE_NAME, $request);
     }
 
diff --git a/lib/SP/Core/Crypt/Session.php b/lib/SP/Core/Crypt/Session.php
index 0b6cb90a..03235005 100644
--- a/lib/SP/Core/Crypt/Session.php
+++ b/lib/SP/Core/Crypt/Session.php
@@ -31,12 +31,13 @@ use SP\Core\Context\SessionContext;
  *
  * @package SP\Core\Crypt
  */
-class Session
+final class Session
 {
     /**
      * Devolver la clave maestra de la sesión
      *
      * @param SessionContext $sessionContext
+     *
      * @return string
      * @throws \Defuse\Crypto\Exception\CryptoException
      */
@@ -47,6 +48,7 @@ class Session
 
     /**
      * @param SessionContext $sessionContext
+     *
      * @return string
      */
     private static function getKey(SessionContext $sessionContext)
@@ -59,6 +61,7 @@ class Session
      *
      * @param                $data
      * @param SessionContext $sessionContext
+     *
      * @throws \Defuse\Crypto\Exception\CryptoException
      */
     public static function saveSessionKey($data, SessionContext $sessionContext)
@@ -70,6 +73,7 @@ class Session
      * Regenerar la clave de sesión
      *
      * @param SessionContext $sessionContext
+     *
      * @throws \Defuse\Crypto\Exception\CryptoException
      */
     public static function reKey(SessionContext $sessionContext)
diff --git a/lib/SP/Core/Crypt/Vault.php b/lib/SP/Core/Crypt/Vault.php
index 06b054db..8a94788e 100644
--- a/lib/SP/Core/Crypt/Vault.php
+++ b/lib/SP/Core/Crypt/Vault.php
@@ -29,7 +29,7 @@ namespace SP\Core\Crypt;
  *
  * @package SP\Core\Crypt
  */
-class Vault
+final class Vault
 {
     /**
      * @var string
diff --git a/lib/SP/Core/DataCollection.php b/lib/SP/Core/DataCollection.php
index 84d25095..aa1d7a8f 100644
--- a/lib/SP/Core/DataCollection.php
+++ b/lib/SP/Core/DataCollection.php
@@ -61,9 +61,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Whether a offset exists
      *
      * @link  http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
      * @param mixed $offset <p>
      *                      An offset to check for.
      *                      </p>
+     *
      * @return boolean true on success or false on failure.
      *                      </p>
      *                      <p>
@@ -79,6 +81,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * See if an attribute exists in the collection
      *
      * @param string $key The name of the parameter
+     *
      * @return boolean
      */
     public function exists($key)
@@ -91,9 +94,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Offset to retrieve
      *
      * @link  http://php.net/manual/en/arrayaccess.offsetget.php
+     *
      * @param mixed $offset <p>
      *                      The offset to retrieve.
      *                      </p>
+     *
      * @return mixed Can return all value types.
      * @since 5.0.0
      */
@@ -109,6 +114,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      *
      * @param string $key         The name of the parameter to return
      * @param mixed  $default_val The default value of the parameter if it contains no value
+     *
      * @return mixed
      */
     public function get($key, $default_val = null)
@@ -124,12 +130,14 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Offset to set
      *
      * @link  http://php.net/manual/en/arrayaccess.offsetset.php
+     *
      * @param mixed $offset <p>
      *                      The offset to assign the value to.
      *                      </p>
      * @param mixed $value  <p>
      *                      The value to set.
      *                      </p>
+     *
      * @return void
      * @since 5.0.0
      */
@@ -143,6 +151,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      *
      * @param string $key   The name of the parameter to set
      * @param mixed  $value The value of the parameter to set
+     *
      * @return DataCollection
      */
     public function set($key, $value)
@@ -156,9 +165,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Offset to unset
      *
      * @link  http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
      * @param mixed $offset <p>
      *                      The offset to unset.
      *                      </p>
+     *
      * @return void
      * @since 5.0.0
      */
@@ -171,6 +182,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Remove an attribute from the collection
      *
      * @param string $key The name of the parameter
+     *
      * @return void
      */
     public function remove($key)
@@ -209,6 +221,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * Replace the collection's attributes
      *
      * @param array $attributes The attributes to replace the collection's with
+     *
      * @return DataCollection
      */
     public function replace(array $attributes = array())
@@ -235,7 +248,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * this instance while treating it as an instance property
      *
      * @see get()
+     *
      * @param string $key The name of the parameter to return
+     *
      * @return mixed
      */
     public function __get($key)
@@ -250,8 +265,10 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * this instance while treating it as an instance property
      *
      * @see set()
+     *
      * @param string $key   The name of the parameter to set
      * @param mixed  $value The value of the parameter to set
+     *
      * @return void
      */
     public function __set($key, $value)
@@ -266,7 +283,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * from this instance while treating it as an instance property
      *
      * @see exists()
+     *
      * @param string $key The name of the parameter
+     *
      * @return boolean
      */
     public function __isset($key)
@@ -281,7 +300,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
      * this instance while treating it as an instance property
      *
      * @see remove()
+     *
      * @param string $key The name of the parameter
+     *
      * @return void
      */
     public function __unset($key)
diff --git a/lib/SP/Core/Dic/Container.php b/lib/SP/Core/Dic/Container.php
index 11f25d19..594b59ec 100644
--- a/lib/SP/Core/Dic/Container.php
+++ b/lib/SP/Core/Dic/Container.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -53,6 +53,7 @@ final class Container implements DicInterface
      *
      * @param string   $name
      * @param callable $callable
+     *
      * @internal param callable|string $class
      */
     public function share($name, $callable = null)
@@ -65,6 +66,7 @@ final class Container implements DicInterface
      *
      * @param string   $name
      * @param callable $callable
+     *
      * @internal param callable|string $class
      */
     public function add($name, $callable = null)
@@ -76,6 +78,7 @@ final class Container implements DicInterface
      * Inject object
      *
      * @param $context
+     *
      * @return mixed
      * @throws \Psr\Container\ContainerExceptionInterface
      */
@@ -156,6 +159,7 @@ final class Container implements DicInterface
 
     /**
      * @param $id
+     *
      * @return mixed
      * @throws ContainerExceptionInterface
      */
@@ -178,6 +182,7 @@ final class Container implements DicInterface
 
     /**
      * @param $id
+     *
      * @return mixed
      */
     private function getSharedObject($id)
diff --git a/lib/SP/Core/Dic/ContainerException.php b/lib/SP/Core/Dic/ContainerException.php
index 9472204b..e084c32f 100644
--- a/lib/SP/Core/Dic/ContainerException.php
+++ b/lib/SP/Core/Dic/ContainerException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Dic/DicInterface.php b/lib/SP/Core/Dic/DicInterface.php
index f33b88d1..4862b746 100644
--- a/lib/SP/Core/Dic/DicInterface.php
+++ b/lib/SP/Core/Dic/DicInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -53,6 +53,7 @@ interface DicInterface extends ContainerInterface
      * Inject object
      *
      * @param $context
+     *
      * @return mixed
      */
     public function inject($context);
diff --git a/lib/SP/Core/Dic/InjectableTrait.php b/lib/SP/Core/Dic/InjectableTrait.php
index 89bc3009..47bcce94 100644
--- a/lib/SP/Core/Dic/InjectableTrait.php
+++ b/lib/SP/Core/Dic/InjectableTrait.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Dic/Injector.php b/lib/SP/Core/Dic/Injector.php
index 28397ff3..2519cd59 100644
--- a/lib/SP/Core/Dic/Injector.php
+++ b/lib/SP/Core/Dic/Injector.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -40,6 +40,7 @@ class Injector
      *
      * @param ContainerInterface $container
      * @param                    $context
+     *
      * @return mixed
      * @throws ContainerException
      */
diff --git a/lib/SP/Core/Dic/NotFoundException.php b/lib/SP/Core/Dic/NotFoundException.php
index a265bd5c..e7e6c269 100644
--- a/lib/SP/Core/Dic/NotFoundException.php
+++ b/lib/SP/Core/Dic/NotFoundException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Events/Event.php b/lib/SP/Core/Events/Event.php
index 5c650997..70bf9640 100644
--- a/lib/SP/Core/Events/Event.php
+++ b/lib/SP/Core/Events/Event.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use InvalidArgumentException;
  *
  * @package SP\Core\Events
  */
-class Event
+final class Event
 {
     /**
      * @var object
@@ -45,8 +45,9 @@ class Event
     /**
      * Event constructor.
      *
-     * @param object $source
+     * @param object       $source
      * @param EventMessage $eventMessage
+     *
      * @throws InvalidArgumentException
      */
     public function __construct($source, EventMessage $eventMessage = null)
diff --git a/lib/SP/Core/Events/EventDispatcher.php b/lib/SP/Core/Events/EventDispatcher.php
index 782afe17..612698af 100644
--- a/lib/SP/Core/Events/EventDispatcher.php
+++ b/lib/SP/Core/Events/EventDispatcher.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Events;
  *
  * @package SP\Core\EventDispatcher
  */
-class EventDispatcher extends EventDispatcherBase
+final class EventDispatcher extends EventDispatcherBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Events/EventDispatcherInterface.php b/lib/SP/Core/Events/EventDispatcherInterface.php
index 4d2f46ef..eadf4230 100644
--- a/lib/SP/Core/Events/EventDispatcherInterface.php
+++ b/lib/SP/Core/Events/EventDispatcherInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Events/EventMessage.php b/lib/SP/Core/Events/EventMessage.php
index 4b753a11..f267c3ae 100644
--- a/lib/SP/Core/Events/EventMessage.php
+++ b/lib/SP/Core/Events/EventMessage.php
@@ -32,7 +32,7 @@ use SP\Html\Html;
  *
  * @package SP\Core\Events
  */
-class EventMessage implements MessageInterface
+final class EventMessage implements MessageInterface
 {
     /**
      * @var array Detalles de la acción en formato "detalle : descripción"
@@ -67,6 +67,7 @@ class EventMessage implements MessageInterface
      * Devuelve la descripción de la acción realizada en formato HTML
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getHtmlDescription($translate = false)
@@ -78,6 +79,7 @@ class EventMessage implements MessageInterface
      * Devuelve la descripción de la acción realizada
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getDescription($translate = false)
@@ -108,6 +110,7 @@ class EventMessage implements MessageInterface
      *
      * @param $key   string
      * @param $value string
+     *
      * @return $this
      */
     public function addDetailHtml($key, $value)
@@ -122,6 +125,7 @@ class EventMessage implements MessageInterface
      *
      * @param $key   string
      * @param $value string
+     *
      * @return $this
      */
     public function addDetail($key, $value)
@@ -141,6 +145,7 @@ class EventMessage implements MessageInterface
      * Formatear una cadena para guardarla en el registro
      *
      * @param $string string La cadena a formatear
+     *
      * @return string
      */
     private function formatString($string)
@@ -152,6 +157,7 @@ class EventMessage implements MessageInterface
      * Establece la descripción de la acción realizada en formato HTML
      *
      * @param string $description
+     *
      * @return $this
      */
     public function addDescriptionHtml($description = '')
@@ -165,6 +171,7 @@ class EventMessage implements MessageInterface
      * Establece la descripción de la acción realizada
      *
      * @param string $description
+     *
      * @return $this
      */
     public function addDescription($description = '')
@@ -188,6 +195,7 @@ class EventMessage implements MessageInterface
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = PHP_EOL)
@@ -199,6 +207,7 @@ class EventMessage implements MessageInterface
      * Devuelve los detalles de la acción realizada
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getDetails($translate = false)
@@ -216,7 +225,8 @@ class EventMessage implements MessageInterface
      * Devolver un detalle formateado
      *
      * @param array $detail
-     * @param bool $translate
+     * @param bool  $translate
+     *
      * @return string
      */
     protected function formatDetail(array $detail, $translate = false)
@@ -259,6 +269,7 @@ class EventMessage implements MessageInterface
      * Devuelve los detalles en formato HTML
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getHtmlDetails($translate = false)
@@ -292,7 +303,8 @@ class EventMessage implements MessageInterface
 
     /**
      * @param string $type
-     * @param mixed $data
+     * @param mixed  $data
+     *
      * @return EventMessage
      */
     public function addData($type, $data)
diff --git a/lib/SP/Core/Events/EventReceiver.php b/lib/SP/Core/Events/EventReceiver.php
index 291d4e8c..3655dfce 100644
--- a/lib/SP/Core/Events/EventReceiver.php
+++ b/lib/SP/Core/Events/EventReceiver.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Exceptions/ConfigException.php b/lib/SP/Core/Exceptions/ConfigException.php
index 1d31d065..489bb39e 100644
--- a/lib/SP/Core/Exceptions/ConfigException.php
+++ b/lib/SP/Core/Exceptions/ConfigException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class ConfigException extends SPException
+final class ConfigException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/ConstraintException.php b/lib/SP/Core/Exceptions/ConstraintException.php
index f92ff658..83e10a3f 100644
--- a/lib/SP/Core/Exceptions/ConstraintException.php
+++ b/lib/SP/Core/Exceptions/ConstraintException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class ConstraintException extends SPException
+final class ConstraintException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/FileNotFoundException.php b/lib/SP/Core/Exceptions/FileNotFoundException.php
index 06981423..8dc5a1e4 100644
--- a/lib/SP/Core/Exceptions/FileNotFoundException.php
+++ b/lib/SP/Core/Exceptions/FileNotFoundException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class FileNotFoundException extends SPException
+final class FileNotFoundException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/InitializationException.php b/lib/SP/Core/Exceptions/InitializationException.php
index 5d6d3eab..dbbc0f50 100644
--- a/lib/SP/Core/Exceptions/InitializationException.php
+++ b/lib/SP/Core/Exceptions/InitializationException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class InitializationException extends SPException
+final class InitializationException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/InvalidArgumentException.php b/lib/SP/Core/Exceptions/InvalidArgumentException.php
index c4c0644c..6dddf8b7 100644
--- a/lib/SP/Core/Exceptions/InvalidArgumentException.php
+++ b/lib/SP/Core/Exceptions/InvalidArgumentException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class InvalidArgumentException extends SPException
+final class InvalidArgumentException extends SPException
 {
-    
+
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/InvalidClassException.php b/lib/SP/Core/Exceptions/InvalidClassException.php
index e15a34a1..ed297afe 100644
--- a/lib/SP/Core/Exceptions/InvalidClassException.php
+++ b/lib/SP/Core/Exceptions/InvalidClassException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class InvalidClassException extends SPException
+final class InvalidClassException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/InvalidImageException.php b/lib/SP/Core/Exceptions/InvalidImageException.php
index 9f632ad3..3e50328d 100644
--- a/lib/SP/Core/Exceptions/InvalidImageException.php
+++ b/lib/SP/Core/Exceptions/InvalidImageException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class InvalidImageException extends SPException
+final class InvalidImageException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/ItemException.php b/lib/SP/Core/Exceptions/ItemException.php
index 849ff8be..c20a23f1 100644
--- a/lib/SP/Core/Exceptions/ItemException.php
+++ b/lib/SP/Core/Exceptions/ItemException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -30,7 +30,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class ItemException extends \Exception
+final class ItemException extends \Exception
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/QueryException.php b/lib/SP/Core/Exceptions/QueryException.php
index bf03310f..5af44747 100644
--- a/lib/SP/Core/Exceptions/QueryException.php
+++ b/lib/SP/Core/Exceptions/QueryException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class QueryException extends SPException
+final class QueryException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Exceptions/SPException.php b/lib/SP/Core/Exceptions/SPException.php
index 48196ac9..844c7d66 100644
--- a/lib/SP/Core/Exceptions/SPException.php
+++ b/lib/SP/Core/Exceptions/SPException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -69,6 +69,7 @@ class SPException extends \Exception
 
     /**
      * @param $type
+     *
      * @return mixed
      */
     public static function getExceptionTypeName($type)
diff --git a/lib/SP/Core/Exceptions/ValidationException.php b/lib/SP/Core/Exceptions/ValidationException.php
index 19d34ce7..ad216d20 100644
--- a/lib/SP/Core/Exceptions/ValidationException.php
+++ b/lib/SP/Core/Exceptions/ValidationException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
  *
  * @package SP\Core\Exceptions
  */
-class ValidationException extends \Exception
+final class ValidationException extends \Exception
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Core/ItemsTypeInterface.php b/lib/SP/Core/ItemsTypeInterface.php
index ad6d6ec3..3e4d2f83 100644
--- a/lib/SP/Core/ItemsTypeInterface.php
+++ b/lib/SP/Core/ItemsTypeInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php
index 820a48f0..90a95a07 100644
--- a/lib/SP/Core/Language.php
+++ b/lib/SP/Core/Language.php
@@ -37,7 +37,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class Language
+final class Language
 {
     /**
      * Lenguaje del usuario
diff --git a/lib/SP/Core/Messages/LogMessage.php b/lib/SP/Core/Messages/LogMessage.php
index dd0c955c..aa8004e7 100644
--- a/lib/SP/Core/Messages/LogMessage.php
+++ b/lib/SP/Core/Messages/LogMessage.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Html\Html;
  *
  * @package SP\Core\Messages
  */
-class LogMessage extends MessageBase
+final class LogMessage extends MessageBase
 {
     /**
      * @var string Acción realizada
@@ -54,6 +54,7 @@ class LogMessage extends MessageBase
      * Devuelve la descripción de la acción realizada en formato HTML
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getHtmlDescription($translate = false)
@@ -65,6 +66,7 @@ class LogMessage extends MessageBase
      * Devuelve la descripción de la acción realizada
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getDescription($translate = false)
@@ -89,6 +91,7 @@ class LogMessage extends MessageBase
      *
      * @param $key   string
      * @param $value string
+     *
      * @return $this
      */
     public function addDetailsHtml($key, $value)
@@ -103,6 +106,7 @@ class LogMessage extends MessageBase
      *
      * @param $key   string
      * @param $value string
+     *
      * @return $this
      */
     public function addDetails($key, $value)
@@ -118,10 +122,23 @@ class LogMessage extends MessageBase
         return $this;
     }
 
+    /**
+     * Formatear una cadena para guardarla en el registro
+     *
+     * @param $string string La cadena a formatear
+     *
+     * @return string
+     */
+    private function formatString($string)
+    {
+        return strip_tags($string);
+    }
+
     /**
      * Establece la descripción de la acción realizada en formato HTML
      *
      * @param string $description
+     *
      * @return $this
      */
     public function addDescriptionHtml($description = '')
@@ -135,6 +152,7 @@ class LogMessage extends MessageBase
      * Establece la descripción de la acción realizada
      *
      * @param string $description
+     *
      * @return $this
      */
     public function addDescription($description = '')
@@ -159,6 +177,7 @@ class LogMessage extends MessageBase
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = PHP_EOL)
@@ -174,6 +193,7 @@ class LogMessage extends MessageBase
      * Devuelve la acción realizada
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getAction($translate = false)
@@ -185,6 +205,7 @@ class LogMessage extends MessageBase
      * Establece la acción realizada
      *
      * @param string $action
+     *
      * @return $this
      */
     public function setAction($action)
@@ -194,21 +215,11 @@ class LogMessage extends MessageBase
         return $this;
     }
 
-    /**
-     * Formatear una cadena para guardarla en el registro
-     *
-     * @param $string string La cadena a formatear
-     * @return string
-     */
-    private function formatString($string)
-    {
-        return strip_tags($string);
-    }
-
     /**
      * Devuelve los detalles de la acción realizada
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getDetails($translate = false)
@@ -234,7 +245,8 @@ class LogMessage extends MessageBase
      * Devolver un detalle formateado
      *
      * @param array $detail
-     * @param bool $translate
+     * @param bool  $translate
+     *
      * @return string
      */
     protected function formatDetail(array $detail, $translate = false)
@@ -289,6 +301,7 @@ class LogMessage extends MessageBase
      * Devuelve los detalles en formato HTML
      *
      * @param bool $translate
+     *
      * @return string
      */
     public function getHtmlDetails($translate = false)
diff --git a/lib/SP/Core/Messages/MailMessage.php b/lib/SP/Core/Messages/MailMessage.php
index 25f69f3f..46656a30 100644
--- a/lib/SP/Core/Messages/MailMessage.php
+++ b/lib/SP/Core/Messages/MailMessage.php
@@ -29,7 +29,7 @@ namespace SP\Core\Messages;
  *
  * @package SP\Core\Messages
  */
-class MailMessage extends MessageBase implements MessageInterface
+final class MailMessage extends MessageBase implements MessageInterface
 {
     /**
      * Adds a blank description line
@@ -59,6 +59,7 @@ class MailMessage extends MessageBase implements MessageInterface
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = PHP_EOL)
diff --git a/lib/SP/Core/Messages/MessageBase.php b/lib/SP/Core/Messages/MessageBase.php
index d3e2f5b2..dde700b2 100644
--- a/lib/SP/Core/Messages/MessageBase.php
+++ b/lib/SP/Core/Messages/MessageBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -62,6 +62,7 @@ abstract class MessageBase implements MessageInterface
 
     /**
      * @param string $title
+     *
      * @return MessageBase
      */
     public function setTitle($title)
@@ -81,6 +82,7 @@ abstract class MessageBase implements MessageInterface
 
     /**
      * @param array $description
+     *
      * @return MessageBase
      */
     public function setDescription(array $description)
@@ -92,6 +94,7 @@ abstract class MessageBase implements MessageInterface
 
     /**
      * @param string $description
+     *
      * @return MessageBase
      */
     public function addDescription($description)
@@ -111,6 +114,7 @@ abstract class MessageBase implements MessageInterface
 
     /**
      * @param array $footer
+     *
      * @return MessageBase
      */
     public function setFooter(array $footer)
diff --git a/lib/SP/Core/Messages/MessageInterface.php b/lib/SP/Core/Messages/MessageInterface.php
index 92b15229..1530d711 100644
--- a/lib/SP/Core/Messages/MessageInterface.php
+++ b/lib/SP/Core/Messages/MessageInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -35,6 +35,7 @@ interface MessageInterface
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = PHP_EOL);
diff --git a/lib/SP/Core/Messages/NotificationMessage.php b/lib/SP/Core/Messages/NotificationMessage.php
index bcecaaf4..269c6377 100644
--- a/lib/SP/Core/Messages/NotificationMessage.php
+++ b/lib/SP/Core/Messages/NotificationMessage.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Messages;
  *
  * @package SP\Core\Messages
  */
-class NotificationMessage extends MessageBase
+final class NotificationMessage extends MessageBase
 {
     /**
      * Componer un mensaje en formato HTML
@@ -51,6 +51,7 @@ class NotificationMessage extends MessageBase
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = PHP_EOL)
diff --git a/lib/SP/Core/Messages/TaskMessage.php b/lib/SP/Core/Messages/TaskMessage.php
index 4ac1ab0c..727ad43d 100644
--- a/lib/SP/Core/Messages/TaskMessage.php
+++ b/lib/SP/Core/Messages/TaskMessage.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use JsonSerializable;
  *
  * @package SP\Core\Messages
  */
-class TaskMessage implements MessageInterface, JsonSerializable
+final class TaskMessage implements MessageInterface, JsonSerializable
 {
     /**
      * @var string
@@ -80,6 +80,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param string $task
+     *
      * @return TaskMessage
      */
     public function setTask($task)
@@ -99,6 +100,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param string $message
+     *
      * @return TaskMessage
      */
     public function setMessage($message)
@@ -118,6 +120,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param int $time
+     *
      * @return TaskMessage
      */
     public function setTime($time)
@@ -137,6 +140,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param int $progress
+     *
      * @return TaskMessage
      */
     public function setProgress($progress)
@@ -156,6 +160,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param int $end
+     *
      * @return TaskMessage
      */
     public function setEnd($end)
@@ -169,6 +174,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
      * Componer un mensaje en formato texto
      *
      * @param string $delimiter
+     *
      * @return string
      */
     public function composeText($delimiter = ';')
@@ -231,6 +237,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
 
     /**
      * @param string $taskId
+     *
      * @return TaskMessage
      */
     public function setTaskId($taskId)
diff --git a/lib/SP/Core/Plugin/PluginBase.php b/lib/SP/Core/Plugin/PluginBase.php
index 0642870c..3d440073 100644
--- a/lib/SP/Core/Plugin/PluginBase.php
+++ b/lib/SP/Core/Plugin/PluginBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Plugin/PluginDataStore.php b/lib/SP/Core/Plugin/PluginDataStore.php
index 3c767546..3bc1ff2c 100644
--- a/lib/SP/Core/Plugin/PluginDataStore.php
+++ b/lib/SP/Core/Plugin/PluginDataStore.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -39,6 +39,7 @@ class PluginDataStore
      * Guardar los datos de un plugin
      *
      * @param PluginInterface $Plugin
+     *
      * @throws \SP\Core\Exceptions\SPException
      */
     public static function save(PluginInterface $Plugin)
@@ -55,6 +56,7 @@ class PluginDataStore
      * Cargar los datos de un plugin
      *
      * @param PluginInterface $Plugin
+     *
      * @return bool
      * @throws \SP\Core\Exceptions\InvalidClassException
      * @throws \SP\Core\Exceptions\SPException
diff --git a/lib/SP/Core/Plugin/PluginEventReceiver.php b/lib/SP/Core/Plugin/PluginEventReceiver.php
index c1cb33c6..5c21e067 100644
--- a/lib/SP/Core/Plugin/PluginEventReceiver.php
+++ b/lib/SP/Core/Plugin/PluginEventReceiver.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Plugin/PluginInterface.php b/lib/SP/Core/Plugin/PluginInterface.php
index d323b52b..282c1bb7 100644
--- a/lib/SP/Core/Plugin/PluginInterface.php
+++ b/lib/SP/Core/Plugin/PluginInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/Plugin/PluginUtil.php b/lib/SP/Core/Plugin/PluginUtil.php
index 78b9c819..82228217 100644
--- a/lib/SP/Core/Plugin/PluginUtil.php
+++ b/lib/SP/Core/Plugin/PluginUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -84,6 +84,7 @@ class PluginUtil
      * Cargar un plugin
      *
      * @param string $name Nombre del plugin
+     *
      * @return bool|PluginInterface
      * @throws \SP\Core\Exceptions\SPException
      */
@@ -149,6 +150,7 @@ class PluginUtil
      * Obtener la información de un plugin
      *
      * @param string $name Nombre del plugin
+     *
      * @return bool|PluginInterface
      * @throws \SP\Core\Exceptions\SPException
      */
diff --git a/lib/SP/Core/SessionUtil.php b/lib/SP/Core/SessionUtil.php
index 5784137d..5637d6fd 100644
--- a/lib/SP/Core/SessionUtil.php
+++ b/lib/SP/Core/SessionUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php
index cf93b34b..60e10bac 100644
--- a/lib/SP/Core/UI/Theme.php
+++ b/lib/SP/Core/UI/Theme.php
@@ -30,8 +30,8 @@ use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Context\SessionContext;
 use SP\Core\Exceptions\InvalidClassException;
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;
 
 defined('APP_ROOT') || die();
 
@@ -40,7 +40,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class Theme implements ThemeInterface
+final class Theme implements ThemeInterface
 {
     const ICONS_CACHE_FILE = CACHE_PATH . DIRECTORY_SEPARATOR . 'icons.cache';
     /**
@@ -105,6 +105,7 @@ class Theme implements ThemeInterface
 
     /**
      * @param bool $force
+     *
      * @throws InvalidClassException
      */
     public function initialize($force = false)
@@ -119,6 +120,7 @@ class Theme implements ThemeInterface
      * Inicializar el tema visual a utilizar
      *
      * @param bool $force Forzar la detección del tema para los inicios de sesión
+     *
      * @return void
      */
     public function initTheme($force = false)
diff --git a/lib/SP/Core/UI/ThemeIconsInterface.php b/lib/SP/Core/UI/ThemeIconsInterface.php
index aa20af7d..da961c0a 100644
--- a/lib/SP/Core/UI/ThemeIconsInterface.php
+++ b/lib/SP/Core/UI/ThemeIconsInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Core/UI/ThemeInterface.php b/lib/SP/Core/UI/ThemeInterface.php
index b4d7236d..5eec553c 100644
--- a/lib/SP/Core/UI/ThemeInterface.php
+++ b/lib/SP/Core/UI/ThemeInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,6 +33,7 @@ interface ThemeInterface
 {
     /**
      * @param bool $force Forzar la detección del tema para los inicios de sesión
+     *
      * @return mixed
      */
     public function initTheme($force = false);
diff --git a/lib/SP/DataModel/AccountData.php b/lib/SP/DataModel/AccountData.php
index 2939f807..ff68b034 100644
--- a/lib/SP/DataModel/AccountData.php
+++ b/lib/SP/DataModel/AccountData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/AccountExtData.php b/lib/SP/DataModel/AccountExtData.php
index 0b1cb480..d91ef95a 100644
--- a/lib/SP/DataModel/AccountExtData.php
+++ b/lib/SP/DataModel/AccountExtData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/AccountHistoryData.php b/lib/SP/DataModel/AccountHistoryData.php
index a722071f..2dcc6c3b 100644
--- a/lib/SP/DataModel/AccountHistoryData.php
+++ b/lib/SP/DataModel/AccountHistoryData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/AccountToUserGroupData.php b/lib/SP/DataModel/AccountToUserGroupData.php
index ad56cb74..c13c234f 100644
--- a/lib/SP/DataModel/AccountToUserGroupData.php
+++ b/lib/SP/DataModel/AccountToUserGroupData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/AccountVData.php b/lib/SP/DataModel/AccountVData.php
index e88da3bf..8738742c 100644
--- a/lib/SP/DataModel/AccountVData.php
+++ b/lib/SP/DataModel/AccountVData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/ActionData.php b/lib/SP/DataModel/ActionData.php
index a761e9ac..6e6fb479 100644
--- a/lib/SP/DataModel/ActionData.php
+++ b/lib/SP/DataModel/ActionData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/AuthTokenData.php b/lib/SP/DataModel/AuthTokenData.php
index 944689dd..77a5416c 100644
--- a/lib/SP/DataModel/AuthTokenData.php
+++ b/lib/SP/DataModel/AuthTokenData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -161,7 +161,7 @@ class AuthTokenData extends DataModelBase implements DataModelInterface
     {
         $this->startDate = (int)$startDate;
     }
-    
+
     /**
      * @return string
      */
diff --git a/lib/SP/DataModel/CategoryData.php b/lib/SP/DataModel/CategoryData.php
index b5440461..a0825dbb 100644
--- a/lib/SP/DataModel/CategoryData.php
+++ b/lib/SP/DataModel/CategoryData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -74,6 +74,7 @@ class CategoryData extends DataModelBase implements DataModelInterface
 
     /**
      * @param int $id
+     *
      * @return $this
      */
     public function setId($id)
diff --git a/lib/SP/DataModel/ClientData.php b/lib/SP/DataModel/ClientData.php
index 656cf63c..6cb849ec 100644
--- a/lib/SP/DataModel/ClientData.php
+++ b/lib/SP/DataModel/ClientData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/ConfigData.php b/lib/SP/DataModel/ConfigData.php
index 75bb9869..297a55d1 100644
--- a/lib/SP/DataModel/ConfigData.php
+++ b/lib/SP/DataModel/ConfigData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/CustomFieldBaseData.php b/lib/SP/DataModel/CustomFieldBaseData.php
index ad63c596..59304c12 100644
--- a/lib/SP/DataModel/CustomFieldBaseData.php
+++ b/lib/SP/DataModel/CustomFieldBaseData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/CustomFieldDefinitionData.php b/lib/SP/DataModel/CustomFieldDefinitionData.php
index 2df5fbef..d9e2f63a 100644
--- a/lib/SP/DataModel/CustomFieldDefinitionData.php
+++ b/lib/SP/DataModel/CustomFieldDefinitionData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/CustomFieldTypeData.php b/lib/SP/DataModel/CustomFieldTypeData.php
index d84453dd..a0187447 100644
--- a/lib/SP/DataModel/CustomFieldTypeData.php
+++ b/lib/SP/DataModel/CustomFieldTypeData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/DataModelBase.php b/lib/SP/DataModel/DataModelBase.php
index a53f1ffb..da1a8a54 100644
--- a/lib/SP/DataModel/DataModelBase.php
+++ b/lib/SP/DataModel/DataModelBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/DataModelInterface.php b/lib/SP/DataModel/DataModelInterface.php
index 95e540e9..1941a7b7 100644
--- a/lib/SP/DataModel/DataModelInterface.php
+++ b/lib/SP/DataModel/DataModelInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/Dto/AccountSearchResponse.php b/lib/SP/DataModel/Dto/AccountSearchResponse.php
index e881efee..3014c52d 100644
--- a/lib/SP/DataModel/Dto/AccountSearchResponse.php
+++ b/lib/SP/DataModel/Dto/AccountSearchResponse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/Dto/ConfigRequest.php b/lib/SP/DataModel/Dto/ConfigRequest.php
index 56d642d0..cbd10c9f 100644
--- a/lib/SP/DataModel/Dto/ConfigRequest.php
+++ b/lib/SP/DataModel/Dto/ConfigRequest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -48,6 +48,7 @@ class ConfigRequest
 
     /**
      * @param $param
+     *
      * @return mixed|null
      */
     public function get($param)
diff --git a/lib/SP/DataModel/FileData.php b/lib/SP/DataModel/FileData.php
index c2bf8d85..78e7572a 100644
--- a/lib/SP/DataModel/FileData.php
+++ b/lib/SP/DataModel/FileData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/FileExtData.php b/lib/SP/DataModel/FileExtData.php
index b4a7d2b1..3ea8f866 100644
--- a/lib/SP/DataModel/FileExtData.php
+++ b/lib/SP/DataModel/FileExtData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/ItemData.php b/lib/SP/DataModel/ItemData.php
index bcd6d97d..56fffce7 100644
--- a/lib/SP/DataModel/ItemData.php
+++ b/lib/SP/DataModel/ItemData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/ItemSearchData.php b/lib/SP/DataModel/ItemSearchData.php
index bf37df6e..a2c180d0 100644
--- a/lib/SP/DataModel/ItemSearchData.php
+++ b/lib/SP/DataModel/ItemSearchData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -23,6 +23,7 @@
  */
 
 namespace SP\DataModel;
+
 use SP\Util\Filter;
 
 
diff --git a/lib/SP/DataModel/NotificationData.php b/lib/SP/DataModel/NotificationData.php
index 43434c43..8b929b45 100644
--- a/lib/SP/DataModel/NotificationData.php
+++ b/lib/SP/DataModel/NotificationData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/PluginData.php b/lib/SP/DataModel/PluginData.php
index 5189a13a..410610fe 100644
--- a/lib/SP/DataModel/PluginData.php
+++ b/lib/SP/DataModel/PluginData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/TagData.php b/lib/SP/DataModel/TagData.php
index aad3f451..fe3995b8 100644
--- a/lib/SP/DataModel/TagData.php
+++ b/lib/SP/DataModel/TagData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/TrackData.php b/lib/SP/DataModel/TrackData.php
index b20c2c00..3d22c0a0 100644
--- a/lib/SP/DataModel/TrackData.php
+++ b/lib/SP/DataModel/TrackData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -140,6 +140,7 @@ class TrackData extends DataModelBase
 
     /**
      * @param string $track_ip
+     *
      * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
     public function setTrackIp($track_ip)
diff --git a/lib/SP/DataModel/UserData.php b/lib/SP/DataModel/UserData.php
index 59321b93..c1f19433 100644
--- a/lib/SP/DataModel/UserData.php
+++ b/lib/SP/DataModel/UserData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -381,7 +381,7 @@ class UserData extends UserPassData implements DataModelInterface
     {
         $this->userGroupName = $userGroupName;
     }
-    
+
     /**
      * @return bool
      */
diff --git a/lib/SP/DataModel/UserGroupData.php b/lib/SP/DataModel/UserGroupData.php
index dd641955..a2b3fa24 100644
--- a/lib/SP/DataModel/UserGroupData.php
+++ b/lib/SP/DataModel/UserGroupData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/UserLoginData.php b/lib/SP/DataModel/UserLoginData.php
index d6fa71b7..d73274f6 100644
--- a/lib/SP/DataModel/UserLoginData.php
+++ b/lib/SP/DataModel/UserLoginData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/UserPassData.php b/lib/SP/DataModel/UserPassData.php
index aeb1436b..c2469599 100644
--- a/lib/SP/DataModel/UserPassData.php
+++ b/lib/SP/DataModel/UserPassData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/UserPassRecoverData.php b/lib/SP/DataModel/UserPassRecoverData.php
index 5ed0d577..08769eb7 100644
--- a/lib/SP/DataModel/UserPassRecoverData.php
+++ b/lib/SP/DataModel/UserPassRecoverData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -111,5 +111,5 @@ class UserPassRecoverData extends DataModelBase
     {
         $this->used = (int)$used;
     }
-    
+
 }
\ No newline at end of file
diff --git a/lib/SP/DataModel/UserPreferencesData.php b/lib/SP/DataModel/UserPreferencesData.php
index efa0977a..d2ff3690 100644
--- a/lib/SP/DataModel/UserPreferencesData.php
+++ b/lib/SP/DataModel/UserPreferencesData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/UserProfileData.php b/lib/SP/DataModel/UserProfileData.php
index c35fa1c5..0bff5275 100644
--- a/lib/SP/DataModel/UserProfileData.php
+++ b/lib/SP/DataModel/UserProfileData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/DataModel/UserToUserGroupData.php b/lib/SP/DataModel/UserToUserGroupData.php
index f653ec63..7f7f7436 100644
--- a/lib/SP/DataModel/UserToUserGroupData.php
+++ b/lib/SP/DataModel/UserToUserGroupData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Html/Assets/FontIcon.php b/lib/SP/Html/Assets/FontIcon.php
index 4a78a0c4..bfc0be1a 100644
--- a/lib/SP/Html/Assets/FontIcon.php
+++ b/lib/SP/Html/Assets/FontIcon.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\Assets
  */
-class FontIcon extends IconBase
+final class FontIcon extends IconBase
 {
     /**
      * @param string $icon
diff --git a/lib/SP/Html/Assets/IconBase.php b/lib/SP/Html/Assets/IconBase.php
index 0173d075..cd0de1cb 100644
--- a/lib/SP/Html/Assets/IconBase.php
+++ b/lib/SP/Html/Assets/IconBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -63,6 +63,7 @@ abstract class IconBase implements IconInterface
 
     /**
      * @param $title
+     *
      * @return $this
      */
     public function setTitle($title)
@@ -82,6 +83,7 @@ abstract class IconBase implements IconInterface
 
     /**
      * @param $class
+     *
      * @return $this
      */
     public function setClass($class)
@@ -101,6 +103,7 @@ abstract class IconBase implements IconInterface
 
     /**
      * @param $icon
+     *
      * @return $this
      */
     public function setIcon($icon)
diff --git a/lib/SP/Html/Assets/IconInterface.php b/lib/SP/Html/Assets/IconInterface.php
index bb1dc625..b2f17fa3 100644
--- a/lib/SP/Html/Assets/IconInterface.php
+++ b/lib/SP/Html/Assets/IconInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Html/Assets/ImageIcon.php b/lib/SP/Html/Assets/ImageIcon.php
index ee3301ce..296f5c55 100644
--- a/lib/SP/Html/Assets/ImageIcon.php
+++ b/lib/SP/Html/Assets/ImageIcon.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\Assets
  */
-class ImageIcon extends IconBase
+final class ImageIcon extends IconBase
 {
     /**
      * @param string $icon
diff --git a/lib/SP/Html/DataGrid/DataGrid.php b/lib/SP/Html/DataGrid/DataGrid.php
index 4533ccee..cd1943a9 100644
--- a/lib/SP/Html/DataGrid/DataGrid.php
+++ b/lib/SP/Html/DataGrid/DataGrid.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGrid extends DataGridBase
+final class DataGrid extends DataGridBase
 {
     /**
      * Título de la pestaña
@@ -40,8 +40,17 @@ class DataGrid extends DataGridBase
      */
     private $_title = '';
 
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->_title;
+    }
+
     /**
      * @param $title string
+     *
      * @return DataGrid
      */
     public function setTitle($title)
@@ -50,12 +59,4 @@ class DataGrid extends DataGridBase
 
         return $this;
     }
-
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
 }
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/DataGridAction.php b/lib/SP/Html/DataGrid/DataGridAction.php
index efdadc49..0a17c18e 100644
--- a/lib/SP/Html/DataGrid/DataGridAction.php
+++ b/lib/SP/Html/DataGrid/DataGridAction.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridAction extends DataGridActionBase
+final class DataGridAction extends DataGridActionBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/DataGridActionBase.php b/lib/SP/Html/DataGrid/DataGridActionBase.php
index 2801a91b..b4f3ed75 100644
--- a/lib/SP/Html/DataGrid/DataGridActionBase.php
+++ b/lib/SP/Html/DataGrid/DataGridActionBase.php
@@ -143,6 +143,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @param string $class
      * @param string $method
+     *
      * @throws \RuntimeException
      * @return $this
      */
@@ -170,6 +171,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $name string
+     *
      * @return $this
      */
     public function setName($name)
@@ -189,6 +191,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param int $id
+     *
      * @return $this
      */
     public function setId($id)
@@ -208,6 +211,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $title string
+     *
      * @return $this
      */
     public function setTitle($title)
@@ -219,6 +223,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $function string
+     *
      * @return $this
      */
     public function setOnClickFunction($function)
@@ -230,6 +235,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $args string
+     *
      * @return $this
      */
     public function setOnClickArgs($args)
@@ -263,6 +269,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $icon IconInterface
+     *
      * @return $this
      */
     public function setIcon($icon)
@@ -274,6 +281,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param $skip bool
+     *
      * @return $this
      */
     public function setSkip($skip)
@@ -301,6 +309,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param bool $helper
+     *
      * @return $this
      */
     public function setIsHelper($helper)
@@ -323,6 +332,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @param       $rowSource string
      * @param mixed $value     Valor a filtrar
+     *
      * @return $this
      */
     public function setFilterRowSource($rowSource, $value = 1)
@@ -342,6 +352,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param int $type El tipo de acción definido en DataGridActionType
+     *
      * @return $this
      */
     public function setType($type)
@@ -361,6 +372,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
 
     /**
      * @param array $data Los datos de los atributos
+     *
      * @return $this
      */
     public function setData(array $data)
@@ -375,6 +387,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @param string $name El nombe del atributo
      * @param mixed  $data Los datos del atributo
+     *
      * @return $this
      */
     public function addData($name, $data)
@@ -396,6 +409,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      * Establecer atributos
      *
      * @param array $attributes Los datos de los atributos
+     *
      * @return $this
      */
     public function setAttributes(array $attributes)
@@ -410,6 +424,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      *
      * @param string $name El nombe del atributo
      * @param mixed  $value
+     *
      * @return $this
      */
     public function addAttribute($name, $value)
@@ -453,6 +468,7 @@ abstract class DataGridActionBase implements DataGridActionInterface
      * Adds a new class
      *
      * @param mixed $value
+     *
      * @return $this
      */
     public function addClass($value)
diff --git a/lib/SP/Html/DataGrid/DataGridActionInterface.php b/lib/SP/Html/DataGrid/DataGridActionInterface.php
index a17d3db1..f47d64cd 100644
--- a/lib/SP/Html/DataGrid/DataGridActionInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridActionInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -113,6 +113,7 @@ interface DataGridActionInterface
     /**
      * @param       $rowSource string
      * @param mixed $value     Valor a filtrar
+     *
      * @return
      */
     public function setFilterRowSource($rowSource, $value = 1);
@@ -141,6 +142,7 @@ interface DataGridActionInterface
      * Establecer atributos de datos
      *
      * @param array $data Los datos de los atributos
+     *
      * @return $this
      */
     public function setData(array $data);
@@ -162,6 +164,7 @@ interface DataGridActionInterface
      * Establecer atributos
      *
      * @param array $attributes Los datos de los atributos
+     *
      * @return $this
      */
     public function setAttributes(array $attributes);
@@ -186,6 +189,7 @@ interface DataGridActionInterface
      *
      * @param string $class
      * @param string $method
+     *
      * @return $this
      */
     public function setRuntimeFilter($class, $method);
@@ -215,6 +219,7 @@ interface DataGridActionInterface
      * Adds a new class
      *
      * @param mixed $value
+     *
      * @return $this
      */
     public function addClass($value);
diff --git a/lib/SP/Html/DataGrid/DataGridActionSearch.php b/lib/SP/Html/DataGrid/DataGridActionSearch.php
index 28049ca1..4d393c2b 100644
--- a/lib/SP/Html/DataGrid/DataGridActionSearch.php
+++ b/lib/SP/Html/DataGrid/DataGridActionSearch.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridActionSearch extends DataGridActionBase
+final class DataGridActionSearch extends DataGridActionBase
 {
     /**
      * @var string
diff --git a/lib/SP/Html/DataGrid/DataGridActionType.php b/lib/SP/Html/DataGrid/DataGridActionType.php
index f51c87be..c23b714d 100644
--- a/lib/SP/Html/DataGrid/DataGridActionType.php
+++ b/lib/SP/Html/DataGrid/DataGridActionType.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridActionType
+final class DataGridActionType
 {
     const MENUBAR_ITEM = 1;
     const VIEW_ITEM = 2;
diff --git a/lib/SP/Html/DataGrid/DataGridBase.php b/lib/SP/Html/DataGrid/DataGridBase.php
index 5d18a5af..d499ab30 100644
--- a/lib/SP/Html/DataGrid/DataGridBase.php
+++ b/lib/SP/Html/DataGrid/DataGridBase.php
@@ -150,6 +150,7 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param \SP\Core\Acl\ActionsInterface $action
+     *
      * @return $this
      */
     public function setOnCloseAction(ActionsInterface $action)
@@ -169,6 +170,7 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param $id string
+     *
      * @return $this
      */
     public function setId($id)
@@ -188,6 +190,7 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param DataGridHeaderInterface $header
+     *
      * @return $this
      */
     public function setHeader(DataGridHeaderInterface $header)
@@ -207,6 +210,7 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param DataGridDataInterface $data
+     *
      * @return $this
      */
     public function setData(DataGridDataInterface $data)
@@ -218,7 +222,8 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param DataGridActionInterface $action
-     * @param bool $isMenu Añadir al menu de acciones
+     * @param bool                    $isMenu Añadir al menu de acciones
+     *
      * @return $this
      */
     public function setDataActions(DataGridActionInterface $action, $isMenu = false)
@@ -268,7 +273,8 @@ abstract class DataGridBase implements DataGridInterface
      * Establecer la plantilla utilizada para la cabecera
      *
      * @param string $template El nombre de la plantilla a utilizar
-     * @param string $base Directorio base para la plantilla
+     * @param string $base     Directorio base para la plantilla
+     *
      * @return $this
      */
     public function setDataHeaderTemplate($template, $base = null)
@@ -287,6 +293,7 @@ abstract class DataGridBase implements DataGridInterface
      *
      * @param      $template
      * @param null $base
+     *
      * @return string
      * @throws FileNotFoundException
      */
@@ -316,6 +323,7 @@ abstract class DataGridBase implements DataGridInterface
      * Establecer la plantilla utilizada para las acciones
      *
      * @param string $template El nombre de la plantilla a utilizar
+     *
      * @return $this
      */
     public function setDataActionsTemplate($template)
@@ -343,7 +351,8 @@ abstract class DataGridBase implements DataGridInterface
      * Establecer la plantilla utilizada para el paginador
      *
      * @param string $template El nombre de la plantilla a utilizar
-     * @param string $base Directorio base para la plantilla
+     * @param string $base     Directorio base para la plantilla
+     *
      * @return $this
      */
     public function setDataPagerTemplate($template, $base = null)
@@ -369,7 +378,8 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param string $template El nombre de la plantilla a utilizar
-     * @param string $base Directorio base para la plantilla
+     * @param string $base     Directorio base para la plantilla
+     *
      * @return mixed
      */
     public function setDataRowTemplate($template, $base = null)
@@ -405,6 +415,7 @@ abstract class DataGridBase implements DataGridInterface
      * Establecer el paginador
      *
      * @param DataGridPagerInterface $pager
+     *
      * @return $this
      */
     public function setPager(DataGridPagerInterface $pager)
@@ -436,6 +447,7 @@ abstract class DataGridBase implements DataGridInterface
 
     /**
      * @param int $time
+     *
      * @return $this
      */
     public function setTime($time)
@@ -459,6 +471,7 @@ abstract class DataGridBase implements DataGridInterface
      * Devolver las acciones filtradas
      *
      * @param $filter
+     *
      * @return DataGridActionInterface[]
      */
     public function getDataActionsFiltered($filter)
@@ -478,6 +491,7 @@ abstract class DataGridBase implements DataGridInterface
      * Devolver las acciones de menu filtradas
      *
      * @param $filter
+     *
      * @return DataGridActionInterface[]
      */
     public function getDataActionsMenuFiltered($filter)
@@ -504,6 +518,7 @@ abstract class DataGridBase implements DataGridInterface
     /**
      * @param      $template
      * @param null $base
+     *
      * @return DataGridBase
      */
     public function setDataTableTemplate($template, $base = null)
diff --git a/lib/SP/Html/DataGrid/DataGridData.php b/lib/SP/Html/DataGrid/DataGridData.php
index ec106bc6..1df7f58f 100644
--- a/lib/SP/Html/DataGrid/DataGridData.php
+++ b/lib/SP/Html/DataGrid/DataGridData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridData extends DataGridDataBase
+final class DataGridData extends DataGridDataBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/DataGridDataInterface.php b/lib/SP/Html/DataGrid/DataGridDataInterface.php
index 1eeab63c..25808eb1 100644
--- a/lib/SP/Html/DataGrid/DataGridDataInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridDataInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -39,8 +39,8 @@ interface DataGridDataInterface
     /**
      * Establecer los orígenes de datos de la consulta
      *
-     * @param string   $source
-     * @param bool     $isMethod
+     * @param string        $source
+     * @param bool          $isMethod
      * @param callable|null $filter
      */
     public function addDataRowSource($source, $isMethod = false, callable $filter = null);
@@ -86,6 +86,7 @@ interface DataGridDataInterface
      * @param       $source string
      * @param       $icon   IconInterface
      * @param mixed $value  Valor para mostrar el icono
+     *
      * @return
      */
     public function addDataRowSourceWithIcon($source, IconInterface $icon, $value = 1);
diff --git a/lib/SP/Html/DataGrid/DataGridHeader.php b/lib/SP/Html/DataGrid/DataGridHeader.php
index a3a78646..8065eb9d 100644
--- a/lib/SP/Html/DataGrid/DataGridHeader.php
+++ b/lib/SP/Html/DataGrid/DataGridHeader.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridHeader extends DataGridHeaderBase
+final class DataGridHeader extends DataGridHeaderBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/DataGridHeaderBase.php b/lib/SP/Html/DataGrid/DataGridHeaderBase.php
index 56aca157..04724bcf 100644
--- a/lib/SP/Html/DataGrid/DataGridHeaderBase.php
+++ b/lib/SP/Html/DataGrid/DataGridHeaderBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Html/DataGrid/DataGridHeaderInterface.php b/lib/SP/Html/DataGrid/DataGridHeaderInterface.php
index caa9c6e0..019e83dc 100644
--- a/lib/SP/Html/DataGrid/DataGridHeaderInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridHeaderInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Html/DataGrid/DataGridHeaderSort.php b/lib/SP/Html/DataGrid/DataGridHeaderSort.php
index 95e27ac1..475567fd 100644
--- a/lib/SP/Html/DataGrid/DataGridHeaderSort.php
+++ b/lib/SP/Html/DataGrid/DataGridHeaderSort.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,12 +33,16 @@ use SplObjectStorage;
  *
  * @package SP\Html\DataGrid
  */
-class DataGridHeaderSort extends DataGridHeaderBase
+final class DataGridHeaderSort extends DataGridHeaderBase
 {
-    /** @var DataGridActionInterface[] */
+    /**
+     * @var DataGridActionInterface[]
+     */
     private $_actions;
 
-    /** @var DataGridSortInterface[] */
+    /**
+     * @var DataGridSortInterface[]
+     */
     private $_sortFields;
 
     /**
@@ -71,6 +75,7 @@ class DataGridHeaderSort extends DataGridHeaderBase
 
     /**
      * @param DataGridSortInterface $field
+     *
      * @return $this
      */
     public function addSortField($field)
diff --git a/lib/SP/Html/DataGrid/DataGridInterface.php b/lib/SP/Html/DataGrid/DataGridInterface.php
index 1a7aaba0..3a5b9f7e 100644
--- a/lib/SP/Html/DataGrid/DataGridInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -67,7 +67,8 @@ interface DataGridInterface
 
     /**
      * @param DataGridActionInterface $action
-     * @param bool $isMenu Añadir al menu de acciones
+     * @param bool                    $isMenu Añadir al menu de acciones
+     *
      * @return $this
      */
     public function setDataActions(DataGridActionInterface $action, $isMenu = false);
@@ -182,6 +183,7 @@ interface DataGridInterface
      * Devolver las acciones filtradas
      *
      * @param $filter
+     *
      * @return DataGridActionInterface[]
      */
     public function getDataActionsFiltered($filter);
@@ -190,12 +192,14 @@ interface DataGridInterface
      * Devolver las acciones de menu filtradas
      *
      * @param $filter
+     *
      * @return DataGridActionInterface[]
      */
     public function getDataActionsMenuFiltered($filter);
 
     /**
      * Actualizar los datos del paginador
+     *
      * @return static
      */
     public function updatePager();
diff --git a/lib/SP/Html/DataGrid/DataGridPager.php b/lib/SP/Html/DataGrid/DataGridPager.php
index 9f71c0b2..0a2be423 100644
--- a/lib/SP/Html/DataGrid/DataGridPager.php
+++ b/lib/SP/Html/DataGrid/DataGridPager.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridPager extends DataGridPagerBase
+final class DataGridPager extends DataGridPagerBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Html/DataGrid/DataGridPagerBase.php b/lib/SP/Html/DataGrid/DataGridPagerBase.php
index 160288eb..774988a6 100644
--- a/lib/SP/Html/DataGrid/DataGridPagerBase.php
+++ b/lib/SP/Html/DataGrid/DataGridPagerBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -102,6 +102,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param int $sortOrder
+     *
      * @return $this
      */
     public function setSortOrder($sortOrder)
@@ -113,6 +114,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param string $sk
+     *
      * @return $this
      */
     public function setSk($sk)
@@ -132,6 +134,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param IconInterface $iconPrev
+     *
      * @return $this
      */
     public function setIconPrev(IconInterface $iconPrev)
@@ -151,6 +154,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param IconInterface $iconNext
+     *
      * @return $this
      */
     public function setIconNext(IconInterface $iconNext)
@@ -170,6 +174,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param IconInterface $iconFirst
+     *
      * @return $this
      */
     public function setIconFirst(IconInterface $iconFirst)
@@ -189,6 +194,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param IconInterface $iconLast
+     *
      * @return $this
      */
     public function setIconLast(IconInterface $iconLast)
@@ -212,6 +218,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer el campo de la búsqueda
      *
      * @param int $sortKey
+     *
      * @return $this
      */
     public function setSortKey($sortKey)
@@ -235,6 +242,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer el registro de inicio de la página
      *
      * @param int $limitStart
+     *
      * @return $this
      */
     public function setLimitStart($limitStart)
@@ -258,6 +266,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer el número de registros en una página
      *
      * @param int $limitCount
+     *
      * @return $this
      */
     public function setLimitCount($limitCount)
@@ -301,6 +310,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer el número total de registros obtenidos
      *
      * @param int $totalRows
+     *
      * @return $this
      */
     public function setTotalRows($totalRows)
@@ -324,6 +334,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer si está activado el filtro
      *
      * @param bool $filterOn
+     *
      * @return $this
      */
     public function setFilterOn($filterOn)
@@ -337,6 +348,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer la función javascript para paginar
      *
      * @param string $function
+     *
      * @return $this
      */
     public function setOnClickFunction($function)
@@ -376,6 +388,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
      * Establecer los argumentos de la función OnClick
      *
      * @param mixed $args
+     *
      * @return $this
      */
     public function setOnClickArgs($args)
@@ -479,6 +492,7 @@ abstract class DataGridPagerBase implements DataGridPagerInterface
 
     /**
      * @param DataGridActionSearch $sourceAction
+     *
      * @return $this
      */
     public function setSourceAction($sourceAction)
diff --git a/lib/SP/Html/DataGrid/DataGridPagerInterface.php b/lib/SP/Html/DataGrid/DataGridPagerInterface.php
index 6ff97787..a8f6681b 100644
--- a/lib/SP/Html/DataGrid/DataGridPagerInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridPagerInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -53,6 +53,7 @@ interface DataGridPagerInterface
      * Establecer el registro de inicio de la página
      *
      * @param int $limitStart
+     *
      * @return static
      */
     public function setLimitStart($limitStart);
@@ -68,6 +69,7 @@ interface DataGridPagerInterface
      * Establecer el número de registros en una página
      *
      * @param int $limitCount
+     *
      * @return static
      */
     public function setLimitCount($limitCount);
@@ -97,6 +99,7 @@ interface DataGridPagerInterface
      * Establecer si está activado el filtro
      *
      * @param bool $filterOn
+     *
      * @return static
      */
     public function setFilterOn($filterOn);
diff --git a/lib/SP/Html/DataGrid/DataGridSort.php b/lib/SP/Html/DataGrid/DataGridSort.php
index 4719fdb9..dd29b6a9 100644
--- a/lib/SP/Html/DataGrid/DataGridSort.php
+++ b/lib/SP/Html/DataGrid/DataGridSort.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,19 +33,31 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridSort implements DataGridSortInterface
+final class DataGridSort implements DataGridSortInterface
 {
-    /** @var int */
+    /**
+     * @var int
+     */
     private $_sortKey = 0;
-    /** @var string */
+    /**
+     * @var string
+     */
     private $_title = '';
-    /** @var string */
+    /**
+     * @var string
+     */
     private $_name = '';
-    /** @var array */
+    /**
+     * @var array
+     */
     private $_class = array();
-    /** @var IconInterface */
+    /**
+     * @var IconInterface
+     */
     private $_iconUp;
-    /** @var IconInterface */
+    /**
+     * @var IconInterface
+     */
     private $_iconDown;
 
     /**
@@ -58,6 +70,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param $key int
+     *
      * @return $this
      */
     public function setSortKey($key)
@@ -77,6 +90,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param $title string
+     *
      * @return $this
      */
     public function setTitle($title)
@@ -96,6 +110,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param $name string
+     *
      * @return $this
      */
     public function setName($name)
@@ -115,6 +130,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param $class string
+     *
      * @return $this
      */
     public function setClass($class)
@@ -134,6 +150,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param IconInterface $icon
+     *
      * @return $this
      */
     public function setIconUp(IconInterface $icon)
@@ -153,6 +170,7 @@ class DataGridSort implements DataGridSortInterface
 
     /**
      * @param IconInterface $icon
+     *
      * @return $this
      */
     public function setIconDown(IconInterface $icon)
diff --git a/lib/SP/Html/DataGrid/DataGridSortInterface.php b/lib/SP/Html/DataGrid/DataGridSortInterface.php
index 892c0768..5f4c80a3 100644
--- a/lib/SP/Html/DataGrid/DataGridSortInterface.php
+++ b/lib/SP/Html/DataGrid/DataGridSortInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Html/DataGrid/DataGridTab.php b/lib/SP/Html/DataGrid/DataGridTab.php
index a007f8c3..9e0ac544 100644
--- a/lib/SP/Html/DataGrid/DataGridTab.php
+++ b/lib/SP/Html/DataGrid/DataGridTab.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Html\DataGrid
  */
-class DataGridTab extends DataGridBase
+final class DataGridTab extends DataGridBase
 {
     /**
      * Título de la pestaña
@@ -40,8 +40,17 @@ class DataGridTab extends DataGridBase
      */
     private $_title = '';
 
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->_title;
+    }
+
     /**
      * @param $title string
+     *
      * @return DataGridTab
      */
     public function setTitle($title)
@@ -50,13 +59,5 @@ class DataGridTab extends DataGridBase
 
         return $this;
     }
-
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
 }
     
diff --git a/lib/SP/Html/Html.php b/lib/SP/Html/Html.php
index 13d646b0..2f5cac0e 100644
--- a/lib/SP/Html/Html.php
+++ b/lib/SP/Html/Html.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,12 +29,13 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de mostrar el HTML
  */
-class Html
+final class Html
 {
     /**
      * Limpia los datos recibidos de un formulario.
      *
      * @param string $data con los datos a limpiar
+     *
      * @return false|string con los datos limpiados
      */
     public static function sanitize(&$data)
@@ -94,6 +95,7 @@ class Html
      * Limpia los datos recibidos de un formulario. Sölo admite cadenas
      *
      * @param $data
+     *
      * @return false|string con los datos limpiados
      */
     public static function sanitizeFull(&$data)
@@ -121,6 +123,7 @@ class Html
      * @param string $text  la cadena a truncar
      * @param int    $limit la longitud máxima de la cadena
      * @param string $ellipsis
+     *
      * @return string con el texto truncado
      *
      * @link http://www.pjgalbraith.com/truncating-text-html-with-php/
@@ -138,6 +141,7 @@ class Html
      * From: http://bavotasan.com/2011/convert-hex-color-to-rgb-using-php/
      *
      * @param array $rgb con color en RGB
+     *
      * @return string
      */
     public static function rgb2hex($rgb)
@@ -154,6 +158,7 @@ class Html
      * Devolver una cadena con el tag HTML strong.
      *
      * @param string $text con la cadena de texto
+     *
      * @return string
      */
     public static function strongText($text)
@@ -168,6 +173,7 @@ class Html
      * @param string $link    con el destino del enlace
      * @param string $title   con el título del enlace
      * @param string $attribs con atributos del enlace
+     *
      * @return string
      */
     public static function anchorText($text, $link = '', $title = '', $attribs = '')
diff --git a/lib/SP/Html/Minify.php b/lib/SP/Html/Minify.php
index 095d10ff..f4ca0a5b 100644
--- a/lib/SP/Html/Minify.php
+++ b/lib/SP/Html/Minify.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -36,7 +36,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class Minify
+final class Minify
 {
     /**
      * Constantes para tipos de archivos
@@ -81,6 +81,7 @@ class Minify
     /**
      * @param string $path
      * @param bool   $checkPath
+     *
      * @return $this
      */
     public function setBase($path, $checkPath = false)
@@ -96,6 +97,7 @@ class Minify
      * devuelve el código HTTP/304
      *
      * @param bool $disableMinify Deshabilitar minimizar
+     *
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
@@ -192,6 +194,7 @@ class Minify
      * Comprimir código javascript.
      *
      * @param string $buffer código a comprimir
+     *
      * @return string
      */
     private function jsCompress($buffer)
@@ -210,6 +213,7 @@ class Minify
     /**
      * @param      $files
      * @param bool $minify
+     *
      * @return Minify
      */
     public function addFilesFromString($files, $minify = true)
@@ -232,6 +236,7 @@ class Minify
      *
      * @param string $file
      * @param bool   $minify Si es necesario reducir
+     *
      * @return $this
      */
     public function addFile($file, $minify = true)
@@ -265,6 +270,7 @@ class Minify
      * Comprobar si es necesario reducir
      *
      * @param string $file El nombre del archivo
+     *
      * @return bool
      */
     private function needsMinify($file)
@@ -275,6 +281,7 @@ class Minify
     /**
      * @param array $files
      * @param bool  $minify
+     *
      * @return Minify
      */
     public function addFiles(array $files, $minify = true)
@@ -311,6 +318,7 @@ class Minify
      * Añadir un recurso desde URL
      *
      * @param $url
+     *
      * @return $this
      */
     public function addUrl($url)
@@ -330,6 +338,7 @@ class Minify
      * Establecer el tipo de recurso a procesar
      *
      * @param int $type
+     *
      * @return $this
      */
     public function setType($type)
diff --git a/lib/SP/Http/Cookies.php b/lib/SP/Http/Cookies.php
index d080b187..2cfde2f7 100644
--- a/lib/SP/Http/Cookies.php
+++ b/lib/SP/Http/Cookies.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Http;
  *
  * @package SP\Http
  */
-class Cookies
+final class Cookies
 {
     /**
      * Comprueba si las cookies están habilitadas
diff --git a/lib/SP/Http/JsonResponse.php b/lib/SP/Http/JsonResponse.php
index f8b4bce3..031ee598 100644
--- a/lib/SP/Http/JsonResponse.php
+++ b/lib/SP/Http/JsonResponse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Http;
  *
  * @package SP\Http
  */
-class JsonResponse implements \JsonSerializable
+final class JsonResponse implements \JsonSerializable
 {
     const JSON_SUCCESS = 0;
     const JSON_SUCCESS_STICKY = 100;
@@ -78,6 +78,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param int $status
+     *
      * @return JsonResponse
      */
     public function setStatus($status)
@@ -97,6 +98,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param string $description
+     *
      * @return JsonResponse
      */
     public function setDescription($description)
@@ -116,6 +118,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param string $action
+     *
      * @return JsonResponse
      */
     public function setAction($action)
@@ -135,6 +138,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param array|\stdClass $data
+     *
      * @return JsonResponse
      */
     public function setData($data)
@@ -154,6 +158,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param array $messages
+     *
      * @return JsonResponse
      */
     public function setMessages(array $messages)
@@ -173,6 +178,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param string $container
+     *
      * @return JsonResponse
      */
     public function setContainer($container)
@@ -192,6 +198,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param string $csrf
+     *
      * @return JsonResponse
      */
     public function setCsrf($csrf)
@@ -203,6 +210,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param $message
+     *
      * @return JsonResponse
      */
     public function addMessage($message)
@@ -213,6 +221,7 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * @param $param
+     *
      * @return $this
      */
     public function addParam($param)
@@ -228,7 +237,8 @@ class JsonResponse implements \JsonSerializable
 
     /**
      * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     *
+     * @link  http://php.net/manual/en/jsonserializable.jsonserialize.php
      * @return mixed data which can be serialized by <b>json_encode</b>,
      * which is a value of any type other than a resource.
      * @since 5.4.0
diff --git a/lib/SP/Http/Message.php b/lib/SP/Http/Message.php
index 3954293b..af2f995e 100644
--- a/lib/SP/Http/Message.php
+++ b/lib/SP/Http/Message.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Http;
  *
  * @package SP\Http
  */
-class Message
+final class Message
 {
     const TYPE_OK = 0;
     const TYPE_ERROR = 1;
diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php
index 2f0a5424..b05309d9 100644
--- a/lib/SP/Http/Request.php
+++ b/lib/SP/Http/Request.php
@@ -37,7 +37,7 @@ use SP\Util\Util;
  *
  * @package SP
  */
-class Request
+final class Request
 {
     /**
      * @var array Directorios seguros para include
diff --git a/lib/SP/Http/Response.php b/lib/SP/Http/Response.php
index bce9d23a..723d9ac9 100644
--- a/lib/SP/Http/Response.php
+++ b/lib/SP/Http/Response.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,13 +33,14 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es encargada de ejecutar acciones comunes para las funciones
  */
-class Response
+final class Response
 {
     /**
      * Devuelve una respuesta en formato XML con el estado y el mensaje.
      *
      * @param string $description mensaje a devolver
      * @param int    $status      devuelve el estado
+     *
      * @return bool
      */
     public static function printXml($description, $status = 1)
diff --git a/lib/SP/Http/Uri.php b/lib/SP/Http/Uri.php
index 9a55c86b..ba3c1391 100644
--- a/lib/SP/Http/Uri.php
+++ b/lib/SP/Http/Uri.php
@@ -31,7 +31,7 @@ use SP\Core\Crypt\Hash;
  *
  * @package SP\Http
  */
-class Uri
+final class Uri
 {
     /**
      * @var string
diff --git a/lib/SP/Http/XMLRPCResponseParse.php b/lib/SP/Http/XMLRPCResponseParse.php
index fa22408a..5c29e0f0 100644
--- a/lib/SP/Http/XMLRPCResponseParse.php
+++ b/lib/SP/Http/XMLRPCResponseParse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -54,6 +54,7 @@ abstract class XMLRPCResponseParse
      * Constructor
      *
      * @param string $xml El documento XML
+     *
      * @throws \InvalidArgumentException
      */
     public function __construct($xml)
@@ -89,6 +90,7 @@ abstract class XMLRPCResponseParse
      * de la clase _data
      *
      * @param DOMNodeList $nodes
+     *
      * @return array
      */
     private function parseNodes(DOMNodeList $nodes)
@@ -121,6 +123,7 @@ abstract class XMLRPCResponseParse
      * Procesar nodos del tipo struct
      *
      * @param DOMElement $xmlStruct
+     *
      * @return array
      */
     private function parseStruct(DOMElement $xmlStruct)
@@ -152,6 +155,7 @@ abstract class XMLRPCResponseParse
 
     /**
      * @param DOMNode $node
+     *
      * @return bool|int|string|null
      */
     private function parseNodeType(DOMNode $node)
@@ -175,6 +179,7 @@ abstract class XMLRPCResponseParse
      * Procesar nodos del tipo array
      *
      * @param DOMElement $xmlArray
+     *
      * @return array
      */
     private function parseArray(DOMElement $xmlArray)
@@ -203,6 +208,7 @@ abstract class XMLRPCResponseParse
      * Procesar nodos del tipo value
      *
      * @param DOMElement $xmlValues
+     *
      * @return array
      */
     private function parseValues(DOMElement $xmlValues)
@@ -228,6 +234,7 @@ abstract class XMLRPCResponseParse
      * Procesar nodos del tipo fault
      *
      * @param DOMElement $xmlFault
+     *
      * @return array
      */
     private function parseFault(DOMElement $xmlFault)
diff --git a/lib/SP/Mvc/Controller/CrudControllerInterface.php b/lib/SP/Mvc/Controller/CrudControllerInterface.php
index 232f0bcf..eb034996 100644
--- a/lib/SP/Mvc/Controller/CrudControllerInterface.php
+++ b/lib/SP/Mvc/Controller/CrudControllerInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Mvc/Model/QueryAssignment.php b/lib/SP/Mvc/Model/QueryAssignment.php
index 335225dd..4a260aea 100644
--- a/lib/SP/Mvc/Model/QueryAssignment.php
+++ b/lib/SP/Mvc/Model/QueryAssignment.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Mvc\Model;
  *
  * @package SP\Mvc\Model
  */
-class QueryAssignment
+final class QueryAssignment
 {
     /**
      * @var array
@@ -43,6 +43,7 @@ class QueryAssignment
     /**
      * @param $field
      * @param $value
+     *
      * @return QueryAssignment
      */
     public function addField($field, $value)
@@ -58,6 +59,7 @@ class QueryAssignment
     /**
      * @param array $fields
      * @param array $values
+     *
      * @return QueryAssignment
      */
     public function setFields(array $fields, array $values)
diff --git a/lib/SP/Mvc/Model/QueryCondition.php b/lib/SP/Mvc/Model/QueryCondition.php
index 4254adc8..9e44e098 100644
--- a/lib/SP/Mvc/Model/QueryCondition.php
+++ b/lib/SP/Mvc/Model/QueryCondition.php
@@ -29,7 +29,7 @@ namespace SP\Mvc\Model;
  *
  * @package SP\Mvc\Model
  */
-class QueryCondition
+final class QueryCondition
 {
     const CONDITION_AND = ' AND ';
     const CONDITION_OR = ' OR ';
@@ -46,6 +46,7 @@ class QueryCondition
     /**
      * @param string $query
      * @param array  $params
+     *
      * @return QueryCondition
      */
     public function addFilter($query, array $params = null)
@@ -61,6 +62,7 @@ class QueryCondition
 
     /**
      * @param string $type
+     *
      * @return string|null
      */
     public function getFilters($type = self::CONDITION_AND)
diff --git a/lib/SP/Mvc/Model/QueryJoin.php b/lib/SP/Mvc/Model/QueryJoin.php
index efaba007..67834ada 100644
--- a/lib/SP/Mvc/Model/QueryJoin.php
+++ b/lib/SP/Mvc/Model/QueryJoin.php
@@ -29,7 +29,7 @@ namespace SP\Mvc\Model;
  *
  * @package SP\Mvc\Model
  */
-class QueryJoin
+final class QueryJoin
 {
     /**
      * @var array
@@ -43,6 +43,7 @@ class QueryJoin
     /**
      * @param string $join
      * @param array  $params
+     *
      * @return QueryJoin
      */
     public function addJoin($join, array $params = null)
diff --git a/lib/SP/Mvc/View/Components/DataTab.php b/lib/SP/Mvc/View/Components/DataTab.php
index 6afd80dc..655c488a 100644
--- a/lib/SP/Mvc/View/Components/DataTab.php
+++ b/lib/SP/Mvc/View/Components/DataTab.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -65,6 +65,7 @@ class DataTab
 
     /**
      * @param string $title
+     *
      * @return DataTab
      */
     public function setTitle($title)
diff --git a/lib/SP/Mvc/View/Components/ItemAdapterInterface.php b/lib/SP/Mvc/View/Components/ItemAdapterInterface.php
index 6876877c..4dc4607c 100644
--- a/lib/SP/Mvc/View/Components/ItemAdapterInterface.php
+++ b/lib/SP/Mvc/View/Components/ItemAdapterInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Mvc/View/Components/SelectItem.php b/lib/SP/Mvc/View/Components/SelectItem.php
index 1ed7fdbc..512d2dc7 100644
--- a/lib/SP/Mvc/View/Components/SelectItem.php
+++ b/lib/SP/Mvc/View/Components/SelectItem.php
@@ -100,6 +100,7 @@ class SelectItem
 
     /**
      * @param $property
+     *
      * @return mixed
      */
     public function getItemProperty($property)
diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
index 5105b3da..0b63cc66 100644
--- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php
+++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
@@ -52,6 +52,7 @@ class SelectItemAdapter implements ItemAdapterInterface
 
     /**
      * @param array $items
+     *
      * @return static
      */
     public static function factory(array $items)
@@ -63,6 +64,7 @@ class SelectItemAdapter implements ItemAdapterInterface
      * Returns an array of ids from the given array of objects
      *
      * @param array $items
+     *
      * @return array
      */
     public static function getIdFromArrayOfObjects(array $items)
@@ -121,6 +123,7 @@ class SelectItemAdapter implements ItemAdapterInterface
      *
      * @param array $selected
      * @param null  $skip
+     *
      * @return SelectItem[]
      */
     public function getItemsFromModelSelected(array $selected, $skip = null)
@@ -165,6 +168,7 @@ class SelectItemAdapter implements ItemAdapterInterface
      *
      * @param array $selected
      * @param bool  $useValueAsKey
+     *
      * @return SelectItem[]
      */
     public function getItemsFromArraySelected(array $selected, $useValueAsKey = false)
diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php
index e80210bd..22ecbf94 100644
--- a/lib/SP/Mvc/View/Template.php
+++ b/lib/SP/Mvc/View/Template.php
@@ -40,7 +40,7 @@ use SP\Core\UI\ThemeInterface;
  * publicada en http://www.sitepoint.com/flexible-view-manipulation-1/
  *
  */
-class Template
+final class Template
 {
     const TEMPLATE_EXTENSION = '.inc';
     const PARTIALS_DIR = '_partials';
@@ -84,6 +84,7 @@ class Template
      *
      * @param string $name Con el nombre del archivo de plantilla
      * @param string $base Directorio base para la plantilla
+     *
      * @return bool
      */
     public function addContentTemplate($name, $base = null)
@@ -102,8 +103,11 @@ class Template
      * Comprobar si un archivo de plantilla existe y se puede leer
      *
      * @param string $template Con el nombre del archivo
+     *
      * @return string La ruta al archivo de la plantilla
+     *
      * @param string $base     Directorio base para la plantilla
+     *
      * @throws \SP\Core\Exceptions\FileNotFoundException
      */
     private function checkTemplate($template, $base = null)
@@ -140,6 +144,7 @@ class Template
      * Removes a template from the stack
      *
      * @param $name
+     *
      * @return Template
      */
     public function removeTemplate($name)
@@ -153,6 +158,7 @@ class Template
      * Removes a template from the stack
      *
      * @param $name
+     *
      * @return Template
      */
     public function removeContentTemplate($name)
@@ -168,6 +174,7 @@ class Template
      * @param string $src Source template
      * @param string $dst Destination template
      * @param string $base
+     *
      * @return mixed|string
      */
     public function replaceTemplate($src, $dst, $base)
@@ -198,6 +205,7 @@ class Template
      *
      * @param string $name Con el nombre del archivo de plantilla
      * @param string $base Directorio base para la plantilla
+     *
      * @return bool
      */
     public function addTemplate($name, $base = null)
@@ -227,6 +235,7 @@ class Template
      * Añadir una nueva plantilla dentro de una plantilla
      *
      * @param string $file Con el nombre del archivo de plantilla
+     *
      * @return bool
      */
     public function includePartial($file)
@@ -239,6 +248,7 @@ class Template
      *
      * @param string $file Con el nombre del archivo de plantilla
      * @param string $base Directorio base para la plantilla
+     *
      * @return bool
      */
     public function includeTemplate($file, $base = null)
@@ -254,6 +264,7 @@ class Template
      * Overloading para controlar la devolución de atributos dinámicos.
      *
      * @param string $name Nombre del atributo
+     *
      * @return null
      * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
@@ -274,6 +285,7 @@ class Template
      *
      * @param string $name  Nombre del atributo
      * @param string $value Valor del atributo
+     *
      * @return null
      */
     public function __set($name, $value)
@@ -287,6 +299,7 @@ class Template
      * en el array de variables de la plantilla.
      *
      * @param string $name Nombre del atributo
+     *
      * @return bool
      */
     public function __isset($name)
@@ -299,6 +312,7 @@ class Template
      * atributo dinámico de la clase
      *
      * @param string $name Nombre del atributo
+     *
      * @return $this
      * @throws \SP\Core\Exceptions\InvalidArgumentException
      */
diff --git a/lib/SP/Mvc/View/View.php b/lib/SP/Mvc/View/View.php
index 52aec10c..4e61d704 100644
--- a/lib/SP/Mvc/View/View.php
+++ b/lib/SP/Mvc/View/View.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Mvc\View;
  *
  * @package SP\Lib\Mvc\View
  */
-class View implements ViewInterface
+final class View implements ViewInterface
 {
     /**
      * @var array
@@ -58,6 +58,7 @@ class View implements ViewInterface
 
     /**
      * View constructor.
+     *
      * @param \Twig_Environment $view
      */
     public function __construct(\Twig_Environment $view)
@@ -71,6 +72,7 @@ class View implements ViewInterface
      *
      * @param $name
      * @param $value
+     *
      * @return $this
      */
     public function assign($name, $value)
@@ -88,6 +90,7 @@ class View implements ViewInterface
      * Establecer variables
      *
      * @param array $vars
+     *
      * @return $this
      */
     public function setVars(array $vars)
@@ -100,8 +103,9 @@ class View implements ViewInterface
     /**
      * Renderizar plantilla
      *
-     * @param $template
+     * @param        $template
      * @param string $path
+     *
      * @return string
      */
     public function render($template, $path = null)
@@ -119,6 +123,7 @@ class View implements ViewInterface
      * Establecer namespace para las plantillas
      *
      * @param $name
+     *
      * @return $this
      */
     public function setNamespace($name)
@@ -132,6 +137,7 @@ class View implements ViewInterface
      * Establecer el controlador
      *
      * @param $name
+     *
      * @return $this
      */
     public function setController($name)
@@ -205,6 +211,7 @@ class View implements ViewInterface
      * Devolver una variable
      *
      * @param $name
+     *
      * @return mixed
      */
     public function get($name)
diff --git a/lib/SP/Mvc/View/ViewInterface.php b/lib/SP/Mvc/View/ViewInterface.php
index 90d738db..853108e0 100644
--- a/lib/SP/Mvc/View/ViewInterface.php
+++ b/lib/SP/Mvc/View/ViewInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -36,6 +36,7 @@ interface ViewInterface
      *
      * @param $name
      * @param $value
+     *
      * @return $this
      */
     public function assign($name, $value);
@@ -44,6 +45,7 @@ interface ViewInterface
      * Devolver una variable
      *
      * @param $name
+     *
      * @return mixed
      */
     public function get($name);
@@ -52,6 +54,7 @@ interface ViewInterface
      * Establecer variables
      *
      * @param array $vars
+     *
      * @return $this
      */
     public function setVars(array $vars);
@@ -59,8 +62,9 @@ interface ViewInterface
     /**
      * Renderizar plantilla
      *
-     * @param $template
+     * @param      $template
      * @param null $path
+     *
      * @return string
      */
     public function render($template, $path = null);
@@ -69,6 +73,7 @@ interface ViewInterface
      * Establecer namespace para las plantillas
      *
      * @param $name
+     *
      * @return $this
      */
     public function setNamespace($name);
@@ -77,6 +82,7 @@ interface ViewInterface
      * Establecer el controlador
      *
      * @param $name
+     *
      * @return $this
      */
     public function setController($name);
diff --git a/lib/SP/Providers/Auth/AuthDataBase.php b/lib/SP/Providers/Auth/AuthDataBase.php
index 054904a9..925ccd36 100644
--- a/lib/SP/Providers/Auth/AuthDataBase.php
+++ b/lib/SP/Providers/Auth/AuthDataBase.php
@@ -102,6 +102,7 @@ abstract class AuthDataBase
 
     /**
      * @param bool $authenticated
+     *
      * @return $this
      */
     public function setAuthenticated($authenticated = null)
diff --git a/lib/SP/Providers/Auth/AuthInterface.php b/lib/SP/Providers/Auth/AuthInterface.php
index c1044778..7c66f04b 100644
--- a/lib/SP/Providers/Auth/AuthInterface.php
+++ b/lib/SP/Providers/Auth/AuthInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -28,6 +28,7 @@ use SP\DataModel\UserLoginData;
 
 /**
  * Interface AuthInterface
+ *
  * @package Auth
  */
 interface AuthInterface
@@ -36,6 +37,7 @@ interface AuthInterface
      * Autentificar al usuario
      *
      * @param UserLoginData $UserData Datos del usuario
+     *
      * @return mixed|AuthDataBase
      */
     public function authenticate(UserLoginData $UserData);
diff --git a/lib/SP/Providers/Auth/AuthProvider.php b/lib/SP/Providers/Auth/AuthProvider.php
index e535552a..2917effd 100644
--- a/lib/SP/Providers/Auth/AuthProvider.php
+++ b/lib/SP/Providers/Auth/AuthProvider.php
@@ -47,7 +47,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Providers\Auth
  */
-class AuthProvider extends Provider
+final class AuthProvider extends Provider
 {
     /**
      * @var array
diff --git a/lib/SP/Providers/Auth/AuthResult.php b/lib/SP/Providers/Auth/AuthResult.php
index b04ff03f..fe30f7d0 100644
--- a/lib/SP/Providers/Auth/AuthResult.php
+++ b/lib/SP/Providers/Auth/AuthResult.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Providers\Auth;
  *
  * @package SP\Providers\Auth
  */
-class AuthResult
+final class AuthResult
 {
     /**
      * @var string
diff --git a/lib/SP/Providers/Auth/AuthUtil.php b/lib/SP/Providers/Auth/AuthUtil.php
deleted file mode 100644
index ef8da124..00000000
--- a/lib/SP/Providers/Auth/AuthUtil.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * sysPass
- *
- * @author nuxsmin 
- * @link https://syspass.org
- * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass 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.
- *
- * sysPass 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 sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SP\Providers\Auth;
-
-/**
- * Class AuthUtil
- *
- * @package SP\Providers\Auth
- */
-class AuthUtil
-{
-    /**
-     * Devuelve el typo de autentificación del servidor web
-     *
-     * @return string
-     */
-    public static function getServerAuthType()
-    {
-        return isset($_SERVER['AUTH_TYPE']) ? strtoupper($_SERVER['AUTH_TYPE']) : __('N/D');
-    }
-}
\ No newline at end of file
diff --git a/lib/SP/Providers/Auth/Browser/Browser.php b/lib/SP/Providers/Auth/Browser/Browser.php
index d35b59e3..4f562c68 100644
--- a/lib/SP/Providers/Auth/Browser/Browser.php
+++ b/lib/SP/Providers/Auth/Browser/Browser.php
@@ -35,7 +35,7 @@ use SP\Providers\Auth\AuthInterface;
  *
  * @package SP\Providers\Auth\Browser
  */
-class Browser implements AuthInterface
+final class Browser implements AuthInterface
 {
     /**
      * @var ConfigData
@@ -56,6 +56,7 @@ class Browser implements AuthInterface
      * Autentificar al usuario
      *
      * @param UserLoginData $userLoginData Datos del usuario
+     *
      * @return BrowserAuthData
      */
     public function authenticate(UserLoginData $userLoginData)
@@ -99,6 +100,7 @@ class Browser implements AuthInterface
      * Comprobar si el usuario es autentificado por el servidor web
      *
      * @param $login string El login del usuario a comprobar
+     *
      * @return bool|null
      */
     public function checkServerAuthUser($login)
diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php b/lib/SP/Providers/Auth/Browser/BrowserAuthData.php
index d8bae0ac..9f66c423 100644
--- a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php
+++ b/lib/SP/Providers/Auth/Browser/BrowserAuthData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Providers\Auth\AuthDataBase;
  *
  * @package SP\Providers\Auth\Browser
  */
-class BrowserAuthData extends AuthDataBase
+final class BrowserAuthData extends AuthDataBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Providers/Auth/Database/Database.php b/lib/SP/Providers/Auth/Database/Database.php
index 49159e10..8009b090 100644
--- a/lib/SP/Providers/Auth/Database/Database.php
+++ b/lib/SP/Providers/Auth/Database/Database.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -38,7 +38,7 @@ use SP\Services\User\UserService;
  *
  * @package SP\Providers\Auth\Database
  */
-class Database implements AuthInterface
+final class Database implements AuthInterface
 {
     /**
      * @var UserLoginData $userLoginData
@@ -56,7 +56,7 @@ class Database implements AuthInterface
     /**
      * Database constructor.
      *
-     * @param UserService $userService
+     * @param UserService     $userService
      * @param UserPassService $userPassService
      */
     public function __construct(UserService $userService, UserPassService $userPassService)
@@ -70,6 +70,7 @@ class Database implements AuthInterface
      * Autentificar al usuario
      *
      * @param UserLoginData $userLoginData Datos del usuario
+     *
      * @return DatabaseAuthData
      */
     public function authenticate(UserLoginData $userLoginData)
@@ -123,6 +124,7 @@ class Database implements AuthInterface
 
     /**
      * @param UserLoginResponse $userLoginResponse
+     *
      * @return bool
      */
     protected function checkMigrateUser(UserLoginResponse $userLoginResponse)
diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php b/lib/SP/Providers/Auth/Database/DatabaseAuthData.php
index 602b952d..a282f74b 100644
--- a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php
+++ b/lib/SP/Providers/Auth/Database/DatabaseAuthData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Providers\Auth\AuthDataBase;
  *
  * @package SP\Auth\Database
  */
-class DatabaseAuthData extends AuthDataBase
+final class DatabaseAuthData extends AuthDataBase
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php b/lib/SP/Providers/Auth/Ldap/LdapAuthData.php
index 2a54224d..10920cd2 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapAuthData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Providers\Auth\AuthDataBase;
  *
  * @package SP\Providers\Auth\Ldap
  */
-class LdapAuthData extends AuthDataBase
+final class LdapAuthData extends AuthDataBase
 {
     /**
      * @var string
diff --git a/lib/SP/Providers/Auth/Ldap/LdapBase.php b/lib/SP/Providers/Auth/Ldap/LdapBase.php
index fcb7ddf2..604ce605 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapBase.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapBase.php
@@ -95,9 +95,9 @@ abstract class LdapBase implements LdapInterface, AuthInterface
     /**
      * LdapBase constructor.
      *
-     * @param LdapParams $ldapParams
+     * @param LdapParams      $ldapParams
      * @param EventDispatcher $eventDispatcher
-     * @param bool $debug
+     * @param bool            $debug
      */
     public function __construct(LdapParams $ldapParams, EventDispatcher $eventDispatcher, $debug = false)
     {
@@ -220,8 +220,9 @@ abstract class LdapBase implements LdapInterface, AuthInterface
     /**
      * Realizar la autentificación con el servidor de LDAP.
      *
-     * @param string $bindDn con el DN del usuario
+     * @param string $bindDn   con el DN del usuario
      * @param string $bindPass con la clave del usuario
+     *
      * @throws LdapException
      * @return bool
      */
@@ -286,6 +287,7 @@ abstract class LdapBase implements LdapInterface, AuthInterface
      * Autentificar al usuario
      *
      * @param UserLoginData $userLoginData Datos del usuario
+     *
      * @return bool
      */
     public function authenticate(UserLoginData $userLoginData)
@@ -415,8 +417,9 @@ abstract class LdapBase implements LdapInterface, AuthInterface
     /**
      * Devolver los resultados de una paginación
      *
-     * @param string $filter Filtro a utilizar
-     * @param array $attributes Atributos a devolver
+     * @param string $filter     Filtro a utilizar
+     * @param array  $attributes Atributos a devolver
+     *
      * @return bool|array
      */
     protected function getResults($filter, array $attributes = null)
@@ -514,7 +517,8 @@ abstract class LdapBase implements LdapInterface, AuthInterface
      * Devolver los objetos disponibles
      *
      * @param string $filter
-     * @param array $attributes
+     * @param array  $attributes
+     *
      * @return array|bool
      * @throws LdapException
      */
@@ -529,7 +533,8 @@ abstract class LdapBase implements LdapInterface, AuthInterface
      * Obtener los objetos según el filtro indicado
      *
      * @param string $filter
-     * @param array $attributes
+     * @param array  $attributes
+     *
      * @return array
      * @throws LdapException
      */
@@ -553,6 +558,7 @@ abstract class LdapBase implements LdapInterface, AuthInterface
      * Devolver los objetos disponibles
      *
      * @param array $attributes
+     *
      * @return array|bool
      * @throws LdapException
      */
@@ -567,6 +573,7 @@ abstract class LdapBase implements LdapInterface, AuthInterface
      * Devolver los objetos disponibles
      *
      * @param array $attributes
+     *
      * @return array|bool
      * @throws LdapException
      */
diff --git a/lib/SP/Providers/Auth/Ldap/LdapException.php b/lib/SP/Providers/Auth/Ldap/LdapException.php
index 509b96fd..7d22b43d 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapException.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Providers\Auth\Ldap
  */
-class LdapException extends SPException
+final class LdapException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Providers/Auth/Ldap/LdapInterface.php b/lib/SP/Providers/Auth/Ldap/LdapInterface.php
index 6d3dd75d..77a388cf 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapInterface.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php b/lib/SP/Providers/Auth/Ldap/LdapMsAds.php
index 8a3f1933..11c59927 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapMsAds.php
@@ -34,7 +34,7 @@ use SP\Core\Events\EventMessage;
  *
  * @package SP\Auth\Ldap
  */
-class LdapMsAds extends LdapBase
+final class LdapMsAds extends LdapBase
 {
     const userObjectFilter = '(|(objectCategory=person)(objectClass=user))';
     const groupObjectFilter = '(objectCategory=group)';
diff --git a/lib/SP/Providers/Auth/Ldap/LdapParams.php b/lib/SP/Providers/Auth/Ldap/LdapParams.php
index 73b2c951..ef76f0de 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapParams.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapParams.php
@@ -29,7 +29,7 @@ namespace SP\Providers\Auth\Ldap;
  *
  * @package SP\Providers\Auth\Ldap
  */
-class LdapParams
+final class LdapParams
 {
     const REGEX_SERVER = '(?<server>(?:(?<proto>ldap|ldaps):\/\/)?[\w\.\-]+)(?::(?<port>\d+))?';
 
diff --git a/lib/SP/Providers/Auth/Ldap/LdapStd.php b/lib/SP/Providers/Auth/Ldap/LdapStd.php
index 3089ae16..786c7da0 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapStd.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapStd.php
@@ -34,7 +34,7 @@ use SP\Core\Events\EventMessage;
  *
  * @package SP\Auth\Ldap
  */
-class LdapStd extends LdapBase
+final class LdapStd extends LdapBase
 {
     const userObjectFilter = '(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject))';
     const groupObjectFilter = '(|(objectClass=groupOfNames)(objectClass=groupOfUniqueNames)(objectClass=group))';
diff --git a/lib/SP/Providers/Auth/Ldap/LdapUtil.php b/lib/SP/Providers/Auth/Ldap/LdapUtil.php
index e8751e69..cf2825cf 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapUtil.php
+++ b/lib/SP/Providers/Auth/Ldap/LdapUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,12 +29,13 @@ namespace SP\Providers\Auth\Ldap;
  *
  * @package SP\Auth\Ldap
  */
-class LdapUtil
+final class LdapUtil
 {
     /**
      * Escapar carácteres especiales en el RDN de LDAP.
      *
      * @param string $dn con el RDN del usuario
+     *
      * @return string
      */
     public static function escapeLdapDN($dn)
diff --git a/lib/SP/Providers/EventsTrait.php b/lib/SP/Providers/EventsTrait.php
index 62d85362..6f66be10 100644
--- a/lib/SP/Providers/EventsTrait.php
+++ b/lib/SP/Providers/EventsTrait.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,6 +33,7 @@ trait EventsTrait
 {
     /**
      * @param array $events
+     *
      * @return mixed
      */
     protected function parseEventsToRegex(array $events)
diff --git a/lib/SP/Providers/Log/DatabaseLogHandler.php b/lib/SP/Providers/Log/DatabaseLogHandler.php
index 1d8be004..4b1ab467 100644
--- a/lib/SP/Providers/Log/DatabaseLogHandler.php
+++ b/lib/SP/Providers/Log/DatabaseLogHandler.php
@@ -39,7 +39,7 @@ use SplSubject;
  *
  * @package SP\Providers\Log
  */
-class DatabaseLogHandler extends Provider implements EventReceiver
+final class DatabaseLogHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
diff --git a/lib/SP/Providers/Log/FileLogHandler.php b/lib/SP/Providers/Log/FileLogHandler.php
index 748b1121..770a5735 100644
--- a/lib/SP/Providers/Log/FileLogHandler.php
+++ b/lib/SP/Providers/Log/FileLogHandler.php
@@ -38,7 +38,7 @@ use SplSubject;
  *
  * @package SP\Providers\Log
  */
-class FileLogHandler extends Provider implements EventReceiver
+final class FileLogHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
diff --git a/lib/SP/Providers/Log/RemoteSyslogHandler.php b/lib/SP/Providers/Log/RemoteSyslogHandler.php
index 2576815a..eb225f80 100644
--- a/lib/SP/Providers/Log/RemoteSyslogHandler.php
+++ b/lib/SP/Providers/Log/RemoteSyslogHandler.php
@@ -39,7 +39,7 @@ use SplSubject;
  *
  * @package SP\Providers\Log
  */
-class RemoteSyslogHandler extends Provider implements EventReceiver
+final class RemoteSyslogHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
diff --git a/lib/SP/Providers/Log/SyslogHandler.php b/lib/SP/Providers/Log/SyslogHandler.php
index 3b5e680e..18a0b18e 100644
--- a/lib/SP/Providers/Log/SyslogHandler.php
+++ b/lib/SP/Providers/Log/SyslogHandler.php
@@ -38,7 +38,7 @@ use SplSubject;
  *
  * @package SP\Providers\Log
  */
-class SyslogHandler extends Provider implements EventReceiver
+final class SyslogHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
diff --git a/lib/SP/Providers/Mail/MailHandler.php b/lib/SP/Providers/Mail/MailHandler.php
index 81e2ac04..38a560c1 100644
--- a/lib/SP/Providers/Mail/MailHandler.php
+++ b/lib/SP/Providers/Mail/MailHandler.php
@@ -31,7 +31,7 @@ use SP\Core\Messages\MailMessage;
 use SP\Http\Request;
 use SP\Providers\EventsTrait;
 use SP\Providers\Provider;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SplSubject;
 
 /**
@@ -39,7 +39,7 @@ use SplSubject;
  *
  * @package SP\Providers\Mail
  */
-class MailHandler extends Provider implements EventReceiver
+final class MailHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
@@ -57,7 +57,7 @@ class MailHandler extends Provider implements EventReceiver
     ];
 
     /**
-     * @var MailService
+     * @var \SP\Services\Mail\MailService
      */
     protected $mailService;
     /**
diff --git a/lib/SP/Providers/Mail/MailParams.php b/lib/SP/Providers/Mail/MailParams.php
index b6f302a5..ed315287 100644
--- a/lib/SP/Providers/Mail/MailParams.php
+++ b/lib/SP/Providers/Mail/MailParams.php
@@ -26,9 +26,10 @@ namespace SP\Providers\Mail;
 
 /**
  * Class MailParams
+ *
  * @package SP\Providers\Mail
  */
-class MailParams
+final class MailParams
 {
     /**
      * @var string
diff --git a/lib/SP/Providers/Mail/MailProvider.php b/lib/SP/Providers/Mail/MailProvider.php
index 371347ad..3bca5213 100644
--- a/lib/SP/Providers/Mail/MailProvider.php
+++ b/lib/SP/Providers/Mail/MailProvider.php
@@ -34,7 +34,7 @@ use SP\Util\Util;
  *
  * @package SP\Providers\Mail
  */
-class MailProvider extends Provider
+final class MailProvider extends Provider
 {
     /**
      * @var  PHPMailer
diff --git a/lib/SP/Providers/Mail/MailProviderException.php b/lib/SP/Providers/Mail/MailProviderException.php
index 23adb503..6350a403 100644
--- a/lib/SP/Providers/Mail/MailProviderException.php
+++ b/lib/SP/Providers/Mail/MailProviderException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin 
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Providers\Mail
  */
-class MailProviderException extends SPException
+final class MailProviderException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Providers/Notification/NotificationHandler.php b/lib/SP/Providers/Notification/NotificationHandler.php
index edc8fb60..db7633e6 100644
--- a/lib/SP/Providers/Notification/NotificationHandler.php
+++ b/lib/SP/Providers/Notification/NotificationHandler.php
@@ -37,7 +37,7 @@ use SplSubject;
  *
  * @package SP\Providers\Notification
  */
-class NotificationHandler extends Provider implements EventReceiver
+final class NotificationHandler extends Provider implements EventReceiver
 {
     const EVENTS = [
         'request.account',
diff --git a/lib/SP/Repositories/Account/AccountFileRepository.php b/lib/SP/Repositories/Account/AccountFileRepository.php
index 1ef0b639..48048d09 100644
--- a/lib/SP/Repositories/Account/AccountFileRepository.php
+++ b/lib/SP/Repositories/Account/AccountFileRepository.php
@@ -38,7 +38,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Account
  */
-class AccountFileRepository extends Repository implements RepositoryItemInterface
+final class AccountFileRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Account/AccountHistoryRepository.php b/lib/SP/Repositories/Account/AccountHistoryRepository.php
index ffced50f..140be8f4 100644
--- a/lib/SP/Repositories/Account/AccountHistoryRepository.php
+++ b/lib/SP/Repositories/Account/AccountHistoryRepository.php
@@ -24,12 +24,10 @@
 
 namespace SP\Repositories\Account;
 
-use SP\Account\AccountUtil;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\AccountHistoryData;
-use SP\DataModel\AccountPassData;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\Repository;
@@ -44,7 +42,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package Services
  */
-class AccountHistoryRepository extends Repository implements RepositoryItemInterface
+final class AccountHistoryRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
@@ -78,30 +76,6 @@ class AccountHistoryRepository extends Repository implements RepositoryItemInter
         return $this->db->doSelect($queryData);
     }
 
-    /**
-     * @param $id
-     *
-     * @return QueryResult
-     * @throws QueryException
-     * @throws ConstraintException
-     * @deprecated
-     */
-    public function getPasswordForHistoryId($id)
-    {
-        $queryWhere = AccountUtil::getAccountHistoryFilterUser($this->context);
-        $queryWhere->addFilter('AccountHistory.id = ?', [$id]);
-
-        $queryData = new QueryData();
-        $queryData->setMapClassName(AccountPassData::class);
-        $queryData->setSelect('AccountHistory.id, AccountHistory.name, AccountHistory.login, AccountHistory.pass, AccountHistory.key, AccountHistory.parentId');
-        $queryData->setFrom('AccountHistory AH');
-        $queryData->setWhere($queryWhere->getFilters());
-        $queryData->setLimit(1);
-
-
-        return $this->db->doSelect($queryData);
-    }
-
     /**
      * Crea una nueva cuenta en la BBDD
      *
diff --git a/lib/SP/Repositories/Account/AccountRepository.php b/lib/SP/Repositories/Account/AccountRepository.php
index 0ba7dd83..da534d67 100644
--- a/lib/SP/Repositories/Account/AccountRepository.php
+++ b/lib/SP/Repositories/Account/AccountRepository.php
@@ -24,9 +24,6 @@
 
 namespace SP\Repositories\Account;
 
-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountUtil;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
@@ -35,7 +32,6 @@ use SP\DataModel\AccountExtData;
 use SP\DataModel\AccountPassData;
 use SP\DataModel\AccountSearchVData;
 use SP\DataModel\AccountVData;
-use SP\DataModel\Dto\AccountSearchResponse;
 use SP\DataModel\ItemData;
 use SP\DataModel\ItemSearchData;
 use SP\Mvc\Model\QueryAssignment;
@@ -45,6 +41,8 @@ use SP\Repositories\Repository;
 use SP\Repositories\RepositoryItemInterface;
 use SP\Repositories\RepositoryItemTrait;
 use SP\Services\Account\AccountPasswordRequest;
+use SP\Services\Account\AccountRequest;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Storage\Database\QueryData;
 use SP\Storage\Database\QueryResult;
 
@@ -53,7 +51,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package Services
  */
-class AccountRepository extends Repository implements RepositoryItemInterface
+final class AccountRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
@@ -77,24 +75,24 @@ class AccountRepository extends Repository implements RepositoryItemInterface
     }
 
     /**
-     * @param $id
+     * @param                $id
+     * @param QueryCondition $queryCondition
      *
      * @return QueryResult
      * @throws ConstraintException
      * @throws QueryException
      */
-    public function getPasswordForId($id)
+    public function getPasswordForId($id, QueryCondition $queryCondition)
     {
-        $queryFilter = AccountUtil::getAccountFilterUser($this->context)
-            ->addFilter('Account.id = ?', [$id]);
+        $queryCondition->addFilter('Account.id = ?', [$id]);
 
         $queryData = new QueryData();
         $queryData->setMapClassName(AccountPassData::class);
         $queryData->setLimit(1);
         $queryData->setSelect('Account.id, Account.name, Account.login, Account.pass, Account.key, Account.parentId');
         $queryData->setFrom('Account');
-        $queryData->setWhere($queryFilter->getFilters());
-        $queryData->setParams($queryFilter->getParams());
+        $queryData->setWhere($queryCondition->getFilters());
+        $queryData->setParams($queryCondition->getParams());
 
         return $this->db->doSelect($queryData);
     }
@@ -334,7 +332,7 @@ class AccountRepository extends Repository implements RepositoryItemInterface
     /**
      * Updates an item
      *
-     * @param AccountRequest $itemData
+     * @param \SP\Services\Account\AccountRequest $itemData
      *
      * @return mixed
      * @throws SPException
@@ -583,13 +581,14 @@ class AccountRepository extends Repository implements RepositoryItemInterface
      * Obtener las cuentas de una búsqueda.
      *
      * @param AccountSearchFilter $accountSearchFilter
+     * @param QueryCondition      $queryFilterUser
      *
-     * @return AccountSearchResponse
+     * @return QueryResult
      * @throws ConstraintException
      * @throws QueryException
      * @throws SPException
      */
-    public function getByFilter(AccountSearchFilter $accountSearchFilter)
+    public function getByFilter(\SP\Services\Account\AccountSearchFilter $accountSearchFilter, QueryCondition $queryFilterUser)
     {
         $queryFilters = new QueryCondition();
 
@@ -617,8 +616,6 @@ class AccountRepository extends Repository implements RepositoryItemInterface
 
         $where = [];
 
-        $queryFilterUser = AccountUtil::getAccountFilterUser($this->context, $accountSearchFilter->getGlobalSearch());
-
         if ($queryFilterUser->hasFilters()) {
             $where[] = $queryFilterUser->getFilters();
         }
@@ -659,7 +656,7 @@ class AccountRepository extends Repository implements RepositoryItemInterface
 
         $queryData->setMapClassName(AccountSearchVData::class);
 
-        return new AccountSearchResponse($this->db->getFullRowCount($queryData), $this->db->doSelect($queryData)->getDataAsArray());
+        return $this->db->doSelect($queryData, true);
     }
 
     /**
diff --git a/lib/SP/Repositories/Account/AccountToFavoriteRepository.php b/lib/SP/Repositories/Account/AccountToFavoriteRepository.php
index 4969622c..81d1962a 100644
--- a/lib/SP/Repositories/Account/AccountToFavoriteRepository.php
+++ b/lib/SP/Repositories/Account/AccountToFavoriteRepository.php
@@ -32,7 +32,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Account
  */
-class AccountToFavoriteRepository extends Repository
+final class AccountToFavoriteRepository extends Repository
 {
     /**
      * Obtener un array con los Ids de cuentas favoritas
diff --git a/lib/SP/Repositories/Account/AccountToTagRepository.php b/lib/SP/Repositories/Account/AccountToTagRepository.php
index b3b515ed..a7d5eae9 100644
--- a/lib/SP/Repositories/Account/AccountToTagRepository.php
+++ b/lib/SP/Repositories/Account/AccountToTagRepository.php
@@ -24,10 +24,10 @@
 
 namespace SP\Repositories\Account;
 
-use SP\Account\AccountRequest;
 use SP\DataModel\ItemData;
 use SP\Repositories\Repository;
 use SP\Repositories\RepositoryItemTrait;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\QueryData;
 
 /**
@@ -35,7 +35,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Account
  */
-class AccountToTagRepository extends Repository
+final class AccountToTagRepository extends Repository
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Account/AccountToUserGroupRepository.php b/lib/SP/Repositories/Account/AccountToUserGroupRepository.php
index 6c501322..db336edf 100644
--- a/lib/SP/Repositories/Account/AccountToUserGroupRepository.php
+++ b/lib/SP/Repositories/Account/AccountToUserGroupRepository.php
@@ -24,10 +24,10 @@
 
 namespace SP\Repositories\Account;
 
-use SP\Account\AccountRequest;
 use SP\DataModel\ItemData;
 use SP\Repositories\Repository;
 use SP\Repositories\RepositoryItemTrait;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\QueryData;
 
 /**
@@ -35,7 +35,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Account
  */
-class AccountToUserGroupRepository extends Repository
+final class AccountToUserGroupRepository extends Repository
 {
     use RepositoryItemTrait;
 
@@ -109,13 +109,13 @@ class AccountToUserGroupRepository extends Repository
     }
 
     /**
-     * @param AccountRequest $accountRequest
+     * @param \SP\Services\Account\AccountRequest $accountRequest
      *
      * @return bool
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function update(AccountRequest $accountRequest)
+    public function update(\SP\Services\Account\AccountRequest $accountRequest)
     {
         $this->deleteByAccountId($accountRequest->id);
 
@@ -140,7 +140,7 @@ class AccountToUserGroupRepository extends Repository
     }
 
     /**
-     * @param AccountRequest $accountRequest
+     * @param \SP\Services\Account\AccountRequest $accountRequest
      *
      * @return int Last ID inserted
      * @throws \SP\Core\Exceptions\ConstraintException
@@ -172,7 +172,7 @@ class AccountToUserGroupRepository extends Repository
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function updateEdit(AccountRequest $accountRequest)
+    public function updateEdit(\SP\Services\Account\AccountRequest $accountRequest)
     {
         $this->deleteEditByAccountId($accountRequest->id);
 
@@ -197,13 +197,13 @@ class AccountToUserGroupRepository extends Repository
     }
 
     /**
-     * @param AccountRequest $accountRequest
+     * @param \SP\Services\Account\AccountRequest $accountRequest
      *
      * @return int
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function addEdit(AccountRequest $accountRequest)
+    public function addEdit(\SP\Services\Account\AccountRequest $accountRequest)
     {
         $query = /** @lang SQL */
             'INSERT INTO AccountToUserGroup (accountId, userGroupId, isEdit) 
diff --git a/lib/SP/Repositories/Account/AccountToUserRepository.php b/lib/SP/Repositories/Account/AccountToUserRepository.php
index edd6dc69..8e36791d 100644
--- a/lib/SP/Repositories/Account/AccountToUserRepository.php
+++ b/lib/SP/Repositories/Account/AccountToUserRepository.php
@@ -24,10 +24,10 @@
 
 namespace SP\Repositories\Account;
 
-use SP\Account\AccountRequest;
 use SP\DataModel\ItemData;
 use SP\Repositories\Repository;
 use SP\Repositories\RepositoryItemTrait;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\QueryData;
 
 /**
@@ -35,7 +35,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Account
  */
-class AccountToUserRepository extends Repository
+final class AccountToUserRepository extends Repository
 {
     use RepositoryItemTrait;
 
@@ -84,7 +84,7 @@ class AccountToUserRepository extends Repository
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function add(AccountRequest $accountRequest)
+    public function add(\SP\Services\Account\AccountRequest $accountRequest)
     {
         $query = /** @lang SQL */
             'INSERT INTO AccountToUser (accountId, userId, isEdit) 
@@ -148,7 +148,7 @@ class AccountToUserRepository extends Repository
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function addEdit(AccountRequest $accountRequest)
+    public function addEdit(\SP\Services\Account\AccountRequest $accountRequest)
     {
         $query = /** @lang SQL */
             'INSERT INTO AccountToUser (accountId, userId, isEdit) 
diff --git a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
index f5f5624e..cbe6df33 100644
--- a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
+++ b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
@@ -38,7 +38,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\ApiToken
  */
-class AuthTokenRepository extends Repository implements RepositoryItemInterface
+final class AuthTokenRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Category/CategoryRepository.php b/lib/SP/Repositories/Category/CategoryRepository.php
index 51e02515..fcbb30cc 100644
--- a/lib/SP/Repositories/Category/CategoryRepository.php
+++ b/lib/SP/Repositories/Category/CategoryRepository.php
@@ -39,7 +39,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Category
  */
-class CategoryRepository extends Repository implements RepositoryItemInterface
+final class CategoryRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Client/ClientRepository.php b/lib/SP/Repositories/Client/ClientRepository.php
index 5faa000b..b9f3048c 100644
--- a/lib/SP/Repositories/Client/ClientRepository.php
+++ b/lib/SP/Repositories/Client/ClientRepository.php
@@ -43,7 +43,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Client
  */
-class ClientRepository extends Repository implements RepositoryItemInterface
+final class ClientRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
@@ -257,7 +257,7 @@ class ClientRepository extends Repository implements RepositoryItemInterface
         if (empty($ids)) {
             return 0;
         }
-        
+
         $queryData = new QueryData();
         $queryData->setQuery('DELETE FROM Client WHERE id IN (' . $this->getParamsFromArray($ids) . ')');
         $queryData->setParams($ids);
diff --git a/lib/SP/Repositories/Config/ConfigRepository.php b/lib/SP/Repositories/Config/ConfigRepository.php
index 36e0ae18..34045aa6 100644
--- a/lib/SP/Repositories/Config/ConfigRepository.php
+++ b/lib/SP/Repositories/Config/ConfigRepository.php
@@ -35,7 +35,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Config
  */
-class ConfigRepository extends Repository
+final class ConfigRepository extends Repository
 {
     /**
      * @param ConfigData $configData
diff --git a/lib/SP/Repositories/CustomField/CustomFieldDefCollection.php b/lib/SP/Repositories/CustomField/CustomFieldDefCollection.php
index 8962dceb..50436fa0 100644
--- a/lib/SP/Repositories/CustomField/CustomFieldDefCollection.php
+++ b/lib/SP/Repositories/CustomField/CustomFieldDefCollection.php
@@ -31,7 +31,7 @@ use SP\Core\DataCollection;
  *
  * @package SP\Repositories\CustomField
  */
-class CustomFieldDefCollection extends DataCollection
+final class CustomFieldDefCollection extends DataCollection
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php b/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php
index 81ab2309..72a4bf7a 100644
--- a/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php
+++ b/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php
@@ -39,7 +39,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\CustomField
  */
-class CustomFieldDefRepository extends Repository implements RepositoryItemInterface
+final class CustomFieldDefRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
     /**
diff --git a/lib/SP/Repositories/CustomField/CustomFieldRepository.php b/lib/SP/Repositories/CustomField/CustomFieldRepository.php
index cd4e47da..554590ed 100644
--- a/lib/SP/Repositories/CustomField/CustomFieldRepository.php
+++ b/lib/SP/Repositories/CustomField/CustomFieldRepository.php
@@ -38,7 +38,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Services
  */
-class CustomFieldRepository extends Repository implements RepositoryItemInterface
+final class CustomFieldRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php b/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php
index b8d8020c..a5603da6 100644
--- a/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php
+++ b/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php
@@ -29,7 +29,6 @@ use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\CustomFieldTypeData;
 use SP\DataModel\ItemSearchData;
-use SP\Repositories\NoSuchItemException;
 use SP\Repositories\Repository;
 use SP\Repositories\RepositoryItemInterface;
 use SP\Repositories\RepositoryItemTrait;
@@ -40,7 +39,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\CustomField
  */
-class CustomFieldTypeRepository extends Repository implements RepositoryItemInterface
+final class CustomFieldTypeRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
@@ -117,9 +116,8 @@ class CustomFieldTypeRepository extends Repository implements RepositoryItemInte
      *
      * @param int $id
      *
-     * @return CustomFieldTypeData
+     * @return \SP\Storage\Database\QueryResult
      * @throws ConstraintException
-     * @throws NoSuchItemException
      * @throws QueryException
      */
     public function getById($id)
@@ -129,19 +127,13 @@ class CustomFieldTypeRepository extends Repository implements RepositoryItemInte
         $queryData->setQuery('SELECT id, `name`, `text` FROM CustomFieldType WHERE id = ? LIMIT 1');
         $queryData->addParam($id);
 
-        $result = $this->db->doSelect($queryData);
-
-        if ($result->getNumRows() === 0) {
-            throw new NoSuchItemException(__u('Tipo de campo no encontrado'));
-        }
-
-        return $result->getData();
+        return $this->db->doSelect($queryData);
     }
 
     /**
      * Returns all the items
      *
-     * @return CustomFieldTypeData[]
+     * @return \SP\Storage\Database\QueryResult
      * @throws ConstraintException
      * @throws QueryException
      */
@@ -151,7 +143,7 @@ class CustomFieldTypeRepository extends Repository implements RepositoryItemInte
         $queryData->setMapClassName(CustomFieldTypeData::class);
         $queryData->setQuery('SELECT id, `name`, `text` FROM CustomFieldType');
 
-        return $this->db->doSelect($queryData)->getDataAsArray();
+        return $this->db->doSelect($queryData);
     }
 
     /**
diff --git a/lib/SP/Repositories/DuplicatedItemException.php b/lib/SP/Repositories/DuplicatedItemException.php
index 1b06500a..2d9448b9 100644
--- a/lib/SP/Repositories/DuplicatedItemException.php
+++ b/lib/SP/Repositories/DuplicatedItemException.php
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Repositories
  */
-class DuplicatedItemException extends SPException
+final class DuplicatedItemException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Repositories/EventLog/EventlogRepository.php b/lib/SP/Repositories/EventLog/EventlogRepository.php
index 8ce377fb..5b26eb13 100644
--- a/lib/SP/Repositories/EventLog/EventlogRepository.php
+++ b/lib/SP/Repositories/EventLog/EventlogRepository.php
@@ -37,7 +37,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\EventLog
  */
-class EventlogRepository extends Repository
+final class EventlogRepository extends Repository
 {
     /**
      * Clears the event log
diff --git a/lib/SP/Repositories/NoSuchItemException.php b/lib/SP/Repositories/NoSuchItemException.php
index 638dbe3f..379f1f37 100644
--- a/lib/SP/Repositories/NoSuchItemException.php
+++ b/lib/SP/Repositories/NoSuchItemException.php
@@ -32,7 +32,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Repositories
  */
-class NoSuchItemException extends SPException
+final class NoSuchItemException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Repositories/Notification/NotificationRepository.php b/lib/SP/Repositories/Notification/NotificationRepository.php
index 4452f8ac..319b9d68 100644
--- a/lib/SP/Repositories/Notification/NotificationRepository.php
+++ b/lib/SP/Repositories/Notification/NotificationRepository.php
@@ -39,7 +39,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Notification
  */
-class NotificationRepository extends Repository implements RepositoryItemInterface
+final class NotificationRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Plugin/PluginRepository.php b/lib/SP/Repositories/Plugin/PluginRepository.php
index 38b9dde4..f97fcb86 100644
--- a/lib/SP/Repositories/Plugin/PluginRepository.php
+++ b/lib/SP/Repositories/Plugin/PluginRepository.php
@@ -41,7 +41,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Plugin
  */
-class PluginRepository extends Repository implements RepositoryItemInterface
+final class PluginRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
index beb53e43..b5e51833 100644
--- a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
+++ b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
@@ -42,7 +42,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\PublicLink
  */
-class PublicLinkRepository extends Repository implements RepositoryItemInterface
+final class PublicLinkRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/RepositoryItemTrait.php b/lib/SP/Repositories/RepositoryItemTrait.php
index 88d87d4b..aa565f98 100644
--- a/lib/SP/Repositories/RepositoryItemTrait.php
+++ b/lib/SP/Repositories/RepositoryItemTrait.php
@@ -25,8 +25,8 @@
 namespace SP\Repositories;
 
 use SP\DataModel\DataModelInterface;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\DBStorageInterface;
-use SP\Storage\Database\DBUtil;
 
 /**
  * Trait RepositoryItemTrait
@@ -74,7 +74,7 @@ trait RepositoryItemTrait
     {
         $charsSrc = ['.', ' ', '_', ', ', '-', ';', '\'', '"', ':', '(', ')', '|', '/'];
 
-        return md5(strtolower(str_replace($charsSrc, '', DBUtil::escape($name, $DBStorage))));
+        return md5(strtolower(str_replace($charsSrc, '', DatabaseUtil::escape($name, $DBStorage))));
     }
 
     /**
diff --git a/lib/SP/Repositories/Tag/TagRepository.php b/lib/SP/Repositories/Tag/TagRepository.php
index c2946889..35546e06 100644
--- a/lib/SP/Repositories/Tag/TagRepository.php
+++ b/lib/SP/Repositories/Tag/TagRepository.php
@@ -40,7 +40,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\Tag
  */
-class TagRepository extends Repository implements RepositoryItemInterface
+final class TagRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/Track/TrackRepository.php b/lib/SP/Repositories/Track/TrackRepository.php
index 14c4df01..2463811f 100644
--- a/lib/SP/Repositories/Track/TrackRepository.php
+++ b/lib/SP/Repositories/Track/TrackRepository.php
@@ -33,7 +33,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\Track
  */
-class TrackRepository extends Repository
+final class TrackRepository extends Repository
 {
     /**
      * @param TrackRequest $trackRequest
diff --git a/lib/SP/Repositories/Track/TrackRequest.php b/lib/SP/Repositories/Track/TrackRequest.php
index 01b453a9..c87fea17 100644
--- a/lib/SP/Repositories/Track/TrackRequest.php
+++ b/lib/SP/Repositories/Track/TrackRequest.php
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\InvalidArgumentException;
  *
  * @package SP\Repositories\Track
  */
-class TrackRequest
+final class TrackRequest
 {
     public $time;
     public $source;
diff --git a/lib/SP/Repositories/User/UserPassRecoverRepository.php b/lib/SP/Repositories/User/UserPassRecoverRepository.php
index 00e87723..84406499 100644
--- a/lib/SP/Repositories/User/UserPassRecoverRepository.php
+++ b/lib/SP/Repositories/User/UserPassRecoverRepository.php
@@ -33,7 +33,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\UserPassRecover
  */
-class UserPassRecoverRepository extends Repository
+final class UserPassRecoverRepository extends Repository
 {
     /**
      * Checks recovery limit attempts by user's id and time
diff --git a/lib/SP/Repositories/User/UserRepository.php b/lib/SP/Repositories/User/UserRepository.php
index 2f1ae718..ae2af47e 100644
--- a/lib/SP/Repositories/User/UserRepository.php
+++ b/lib/SP/Repositories/User/UserRepository.php
@@ -43,7 +43,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\User
  */
-class UserRepository extends Repository implements RepositoryItemInterface
+final class UserRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
@@ -547,7 +547,7 @@ class UserRepository extends Repository implements RepositoryItemInterface
         $queryData->setParams([$login, $login]);
         $queryData->setOnErrorMessage(__u('Error al obtener los datos del usuario'));
 
-        return$this->db->doSelect($queryData);
+        return $this->db->doSelect($queryData);
     }
 
     /**
diff --git a/lib/SP/Repositories/UserGroup/UserGroupRepository.php b/lib/SP/Repositories/UserGroup/UserGroupRepository.php
index bc194e50..f027163b 100644
--- a/lib/SP/Repositories/UserGroup/UserGroupRepository.php
+++ b/lib/SP/Repositories/UserGroup/UserGroupRepository.php
@@ -41,7 +41,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\UserGroup
  */
-class UserGroupRepository extends Repository implements RepositoryItemInterface
+final class UserGroupRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php b/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php
index 34b0779a..44090f3f 100644
--- a/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php
+++ b/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php
@@ -34,7 +34,7 @@ use SP\Storage\Database\QueryData;
  *
  * @package SP\Repositories\UserGroup
  */
-class UserToUserGroupRepository extends Repository
+final class UserToUserGroupRepository extends Repository
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Repositories/UserProfile/UserProfileRepository.php b/lib/SP/Repositories/UserProfile/UserProfileRepository.php
index e1e2685d..411b2be0 100644
--- a/lib/SP/Repositories/UserProfile/UserProfileRepository.php
+++ b/lib/SP/Repositories/UserProfile/UserProfileRepository.php
@@ -40,7 +40,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Repositories\UserProfile
  */
-class UserProfileRepository extends Repository implements RepositoryItemInterface
+final class UserProfileRepository extends Repository implements RepositoryItemInterface
 {
     use RepositoryItemTrait;
 
diff --git a/lib/SP/Account/AccountAcl.php b/lib/SP/Services/Account/AccountAcl.php
similarity index 99%
rename from lib/SP/Account/AccountAcl.php
rename to lib/SP/Services/Account/AccountAcl.php
index 1d2717da..cea354e0 100644
--- a/lib/SP/Account/AccountAcl.php
+++ b/lib/SP/Services/Account/AccountAcl.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
 use SP\Core\Acl\Acl;
 
diff --git a/lib/SP/Services/Account/AccountAclService.php b/lib/SP/Services/Account/AccountAclService.php
index 9b0bf24e..3d847ccc 100644
--- a/lib/SP/Services/Account/AccountAclService.php
+++ b/lib/SP/Services/Account/AccountAclService.php
@@ -24,7 +24,6 @@
 
 namespace SP\Services\Account;
 
-use SP\Account\AccountAcl;
 use SP\Core\Acl\Acl;
 use SP\Core\Exceptions\FileNotFoundException;
 use SP\DataModel\Dto\AccountAclDto;
@@ -32,8 +31,8 @@ use SP\DataModel\ProfileData;
 use SP\Services\Service;
 use SP\Services\User\UserLoginResponse;
 use SP\Services\UserGroup\UserToUserGroupService;
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;
 use SP\Util\FileUtil;
 
 /**
@@ -41,12 +40,15 @@ use SP\Util\FileUtil;
  *
  * @package SP\Services\Account
  */
-class AccountAclService extends Service
+final class AccountAclService extends Service
 {
     /**
      * ACL's file base path
      */
     const ACL_PATH = CACHE_PATH . DIRECTORY_SEPARATOR . 'accountAcl' . DIRECTORY_SEPARATOR;
+    /**
+     * @var bool
+     */
     public static $useCache = true;
     /**
      * @var AccountAclDto
@@ -61,7 +63,7 @@ class AccountAclService extends Service
      */
     private $acl;
     /**
-     * @var FileCache
+     * @var \SP\Storage\File\FileCache
      */
     private $fileCache;
     /**
@@ -161,10 +163,16 @@ class AccountAclService extends Service
     public function getAclFromCache($accountId, $actionId)
     {
         try {
-            return $this->fileCache->load($this->getCacheFileForAcl($accountId, $actionId));
+            $acl = $this->fileCache->load($this->getCacheFileForAcl($accountId, $actionId));
+
+            if ($acl instanceof AccountAcl) {
+                return $acl;
+            }
         } catch (FileException $e) {
-            return null;
+            debugLog($e->getMessage());
         }
+
+        return null;
     }
 
     /**
@@ -376,7 +384,7 @@ class AccountAclService extends Service
      *
      * @param AccountAcl $accountAcl
      *
-     * @return null|\SP\Storage\FileStorageInterface
+     * @return null|\SP\Storage\File\FileStorageInterface
      */
     public function saveAclInCache(AccountAcl $accountAcl)
     {
diff --git a/lib/SP/Services/Account/AccountCryptService.php b/lib/SP/Services/Account/AccountCryptService.php
index c153732c..a883f321 100644
--- a/lib/SP/Services/Account/AccountCryptService.php
+++ b/lib/SP/Services/Account/AccountCryptService.php
@@ -40,7 +40,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Account
  */
-class AccountCryptService extends Service
+final class AccountCryptService extends Service
 {
     /**
      * @var AccountService
diff --git a/lib/SP/Services/Account/AccountFileService.php b/lib/SP/Services/Account/AccountFileService.php
index 845d6e38..444584b2 100644
--- a/lib/SP/Services/Account/AccountFileService.php
+++ b/lib/SP/Services/Account/AccountFileService.php
@@ -41,7 +41,7 @@ use SP\Util\ImageUtil;
  *
  * @package SP\Services\Account
  */
-class AccountFileService extends Service
+final class AccountFileService extends Service
 {
     /**
      * @var AccountFileRepository
diff --git a/lib/SP/Account/AccountUtil.php b/lib/SP/Services/Account/AccountFilterUser.php
similarity index 62%
rename from lib/SP/Account/AccountUtil.php
rename to lib/SP/Services/Account/AccountFilterUser.php
index 19eb51cf..1f1f0c37 100644
--- a/lib/SP/Account/AccountUtil.php
+++ b/lib/SP/Services/Account/AccountFilterUser.php
@@ -22,10 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
+use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
+use SP\DataModel\ProfileData;
 use SP\Mvc\Model\QueryCondition;
+use SP\Services\User\UserLoginResponse;
 
 defined('APP_ROOT') || die();
 
@@ -34,25 +37,51 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class AccountUtil
+final class AccountFilterUser
 {
+    /**
+     * @var ProfileData
+     */
+    private $userProfile;
+    /**
+     * @var ConfigData
+     */
+    private $configData;
+    /**
+     * @var UserLoginResponse
+     */
+    private $userData;
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * AccountFilterUser constructor.
+     *
+     * @param ContextInterface $context
+     */
+    public function __construct(ContextInterface $context)
+    {
+        $this->context = $context;
+    }
+
     /**
      * Devuelve el filtro para la consulta SQL de cuentas que un usuario puede acceder
      *
-     * @param ContextInterface $context
-     * @param bool             $useGlobalSearch
+     * @param bool $useGlobalSearch
+     *
      * @return QueryCondition
      */
-    public static function getAccountHistoryFilterUser(ContextInterface $context, $useGlobalSearch = false)
+    public function getFilterHistory($useGlobalSearch = false)
     {
+        $this->setUp();
+
         $queryFilter = new QueryCondition();
 
-        $configData = $context->getConfig();
-        $userData = $context->getUserData();
-
-        if (!$userData->getIsAdminApp()
-            && !$userData->getIsAdminAcc()
-            && !($useGlobalSearch && $context->getUserProfile()->isAccGlobalSearch() && $configData->isGlobalSearch())
+        if (!$this->userData->getIsAdminApp()
+            && !$this->userData->getIsAdminAcc()
+            && !($this->configData->isGlobalSearch() && $useGlobalSearch && $this->userProfile->isAccGlobalSearch())
         ) {
             // Filtro usuario y grupo
             $filter = '(AccountHistory.userId = ? 
@@ -60,12 +89,16 @@ class AccountUtil
             OR AccountHistory.accountId IN (SELECT accountId AS accountId FROM AccountToUser WHERE accountId = AccountHistory.accountId AND userId = ? UNION ALL SELECT accountId FROM AccountToUserGroup WHERE accountId = AccountHistory.accountId AND userGroupId = ?)
             OR AccountHistory.userGroupId IN (SELECT userGroupId FROM UserToUserGroup WHERE userGroupId = AccountHistory.userGroupId AND userId = ?))';
 
-            $params = [$userData->getId(), $userData->getUserGroupId(), $userData->getId(), $userData->getUserGroupId(), $userData->getId()];
+            $params = [$this->userData->getId(),
+                $this->userData->getUserGroupId(),
+                $this->userData->getId(),
+                $this->userData->getUserGroupId(),
+                $this->userData->getId()];
 
-            if ($configData->isAccountFullGroupAccess()) {
+            if ($this->configData->isAccountFullGroupAccess()) {
                 // Filtro de grupos secundarios en grupos que incluyen al usuario
                 $filter .= PHP_EOL . 'OR AccountHistory.accountId = (SELECT accountId FROM AccountToUserGroup aug INNER JOIN UserToUserGroup uug ON uug.userGroupId = aug.userGroupId WHERE aug.accountId = AccountHistory.accountId AND uug.userId = ? LIMIT 1)';
-                $params[] = $userData->getId();
+                $params[] = $this->userData->getId();
             }
 
             $queryFilter->addFilter($filter, $params);
@@ -73,29 +106,38 @@ class AccountUtil
 
         $queryFilter->addFilter(
             '(AccountHistory.isPrivate IS NULL OR AccountHistory.isPrivate = 0 OR (AccountHistory.isPrivate = 1 AND AccountHistory.userId = ?)) AND (AccountHistory.isPrivateGroup IS NULL OR AccountHistory.isPrivateGroup = 0 OR (AccountHistory.isPrivateGroup = 1 AND AccountHistory.userGroupId = ?))',
-            [$userData->getId(), $userData->getUserGroupId()]
+            [$this->userData->getId(), $this->userData->getUserGroupId()]
         );
 
         return $queryFilter;
     }
 
+    /**
+     * setUp
+     */
+    private function setUp()
+    {
+        $this->configData = $this->context->getConfig();
+        $this->userData = $this->context->getUserData();
+        $this->userProfile = $this->context->getUserProfile();
+    }
+
     /**
      * Devuelve el filtro para la consulta SQL de cuentas que un usuario puede acceder
      *
-     * @param ContextInterface $context
-     * @param bool             $useGlobalSearch
+     * @param bool $useGlobalSearch
+     *
      * @return QueryCondition
      */
-    public static function getAccountFilterUser(ContextInterface $context, $useGlobalSearch = false)
+    public function getFilter($useGlobalSearch = false)
     {
+        $this->setUp();
+
         $queryFilter = new QueryCondition();
 
-        $configData = $context->getConfig();
-        $userData = $context->getUserData();
-
-        if (!$userData->getIsAdminApp()
-            && !$userData->getIsAdminAcc()
-            && !($useGlobalSearch && $context->getUserProfile()->isAccGlobalSearch() && $configData->isGlobalSearch())
+        if (!$this->userData->getIsAdminApp()
+            && !$this->userData->getIsAdminAcc()
+            && !($this->configData->isGlobalSearch() && $useGlobalSearch && $this->userProfile->isAccGlobalSearch())
         ) {
             // Filtro usuario y grupo
             $filter = '(Account.userId = ? 
@@ -103,12 +145,16 @@ class AccountUtil
             OR Account.id IN (SELECT accountId AS accountId FROM AccountToUser WHERE accountId = Account.id AND userId = ? UNION ALL SELECT accountId FROM AccountToUserGroup WHERE accountId = Account.id AND userGroupId = ?)
             OR Account.userGroupId IN (SELECT userGroupId FROM UserToUserGroup WHERE userGroupId = Account.userGroupId AND userId = ?))';
 
-            $params = [$userData->getId(), $userData->getUserGroupId(), $userData->getId(), $userData->getUserGroupId(), $userData->getId()];
+            $params = [$this->userData->getId(),
+                $this->userData->getUserGroupId(),
+                $this->userData->getId(),
+                $this->userData->getUserGroupId(),
+                $this->userData->getId()];
 
-            if ($configData->isAccountFullGroupAccess()) {
+            if ($this->configData->isAccountFullGroupAccess()) {
                 // Filtro de grupos secundarios en grupos que incluyen al usuario
                 $filter .= PHP_EOL . 'OR Account.id = (SELECT accountId FROM AccountToUserGroup aug INNER JOIN UserToUserGroup uug ON uug.userGroupId = aug.userGroupId WHERE aug.accountId = Account.id AND uug.userId = ? LIMIT 1)';
-                $params[] = $userData->getId();
+                $params[] = $this->userData->getId();
             }
 
             $queryFilter->addFilter($filter, $params);
@@ -116,7 +162,7 @@ class AccountUtil
 
         $queryFilter->addFilter(
             '(Account.isPrivate IS NULL OR Account.isPrivate = 0 OR (Account.isPrivate = 1 AND Account.userId = ?)) AND (Account.isPrivateGroup IS NULL OR Account.isPrivateGroup = 0 OR (Account.isPrivateGroup = 1 AND Account.userGroupId = ?))',
-            [$userData->getId(), $userData->getUserGroupId()]
+            [$this->userData->getId(), $this->userData->getUserGroupId()]
         );
 
         return $queryFilter;
diff --git a/lib/SP/Services/Account/AccountHistoryService.php b/lib/SP/Services/Account/AccountHistoryService.php
index 7eb42554..9e762f39 100644
--- a/lib/SP/Services/Account/AccountHistoryService.php
+++ b/lib/SP/Services/Account/AccountHistoryService.php
@@ -43,7 +43,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\Account
  */
-class AccountHistoryService extends Service
+final class AccountHistoryService extends Service
 {
     /**
      * @var AccountHistoryRepository
diff --git a/lib/SP/Account/AccountInterface.php b/lib/SP/Services/Account/AccountInterface.php
similarity index 93%
rename from lib/SP/Account/AccountInterface.php
rename to lib/SP/Services/Account/AccountInterface.php
index 641bd4d2..adcf64df 100644
--- a/lib/SP/Account/AccountInterface.php
+++ b/lib/SP/Services/Account/AccountInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
 use SP\DataModel\AccountData;
 use SP\DataModel\AccountExtData;
@@ -42,12 +42,14 @@ interface AccountInterface
 
     /**
      * @param bool $encryptPass Si se encripta la clave de la cuenta
+     *
      * @return mixed
      */
     public function createAccount($encryptPass = true);
 
     /**
      * @param $id
+     *
      * @return mixed
      */
     public function deleteAccount($id);
diff --git a/lib/SP/Services/Account/AccountPasswordRequest.php b/lib/SP/Services/Account/AccountPasswordRequest.php
index 3490f192..e9195b55 100644
--- a/lib/SP/Services/Account/AccountPasswordRequest.php
+++ b/lib/SP/Services/Account/AccountPasswordRequest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\Account;
  *
  * @package SP\Services\Account
  */
-class AccountPasswordRequest
+final class AccountPasswordRequest
 {
     /**
      * @var int
diff --git a/lib/SP/Account/AccountRequest.php b/lib/SP/Services/Account/AccountRequest.php
similarity index 98%
rename from lib/SP/Account/AccountRequest.php
rename to lib/SP/Services/Account/AccountRequest.php
index 04631d46..bd1e899b 100644
--- a/lib/SP/Account/AccountRequest.php
+++ b/lib/SP/Services/Account/AccountRequest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
 /**
  * Class AccountRequest
diff --git a/lib/SP/Account/AccountSearchFilter.php b/lib/SP/Services/Account/AccountSearchFilter.php
similarity index 98%
rename from lib/SP/Account/AccountSearchFilter.php
rename to lib/SP/Services/Account/AccountSearchFilter.php
index 9765426d..12443b55 100644
--- a/lib/SP/Account/AccountSearchFilter.php
+++ b/lib/SP/Services/Account/AccountSearchFilter.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
 use SP\Mvc\Model\QueryCondition;
 use SP\Util\Filter;
@@ -33,7 +33,7 @@ use SP\Util\Filter;
  *
  * @package SP\Account
  */
-class AccountSearchFilter
+final class AccountSearchFilter
 {
     /**
      * Constantes de ordenación
@@ -118,6 +118,7 @@ class AccountSearchFilter
 
     /**
      * @param boolean $searchFavorites
+     *
      * @return $this
      */
     public function setSearchFavorites($searchFavorites)
@@ -137,6 +138,7 @@ class AccountSearchFilter
 
     /**
      * @param int $globalSearch
+     *
      * @return $this
      */
     public function setGlobalSearch($globalSearch)
@@ -156,6 +158,7 @@ class AccountSearchFilter
 
     /**
      * @param string $txtSearch
+     *
      * @return $this
      */
     public function setTxtSearch($txtSearch)
@@ -175,6 +178,7 @@ class AccountSearchFilter
 
     /**
      * @param int $clientId
+     *
      * @return $this
      */
     public function setClientId($clientId)
@@ -194,6 +198,7 @@ class AccountSearchFilter
 
     /**
      * @param int $categoryId
+     *
      * @return $this
      */
     public function setCategoryId($categoryId)
@@ -213,6 +218,7 @@ class AccountSearchFilter
 
     /**
      * @param int $sortOrder
+     *
      * @return $this
      */
     public function setSortOrder($sortOrder)
@@ -232,6 +238,7 @@ class AccountSearchFilter
 
     /**
      * @param int $limitStart
+     *
      * @return $this
      */
     public function setLimitStart($limitStart)
@@ -251,6 +258,7 @@ class AccountSearchFilter
 
     /**
      * @param int $limitCount
+     *
      * @return $this
      */
     public function setLimitCount($limitCount)
@@ -270,6 +278,7 @@ class AccountSearchFilter
 
     /**
      * @param array $tagsId
+     *
      * @return $this
      */
     public function setTagsId($tagsId)
@@ -353,6 +362,7 @@ class AccountSearchFilter
 
     /**
      * @param boolean $sortViews
+     *
      * @return $this
      */
     public function setSortViews($sortViews)
@@ -372,6 +382,7 @@ class AccountSearchFilter
 
     /**
      * @param int $sortKey
+     *
      * @return $this
      */
     public function setSortKey($sortKey)
diff --git a/lib/SP/Account/AccountSearchItem.php b/lib/SP/Services/Account/AccountSearchItem.php
similarity index 99%
rename from lib/SP/Account/AccountSearchItem.php
rename to lib/SP/Services/Account/AccountSearchItem.php
index 02cc68bc..f888bdbe 100644
--- a/lib/SP/Account/AccountSearchItem.php
+++ b/lib/SP/Services/Account/AccountSearchItem.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Account;
+namespace SP\Services\Account;
 
 defined('APP_ROOT') || die();
 
@@ -37,7 +37,7 @@ use SP\Services\PublicLink\PublicLinkService;
  *
  * @package SP\Controller
  */
-class AccountSearchItem
+final class AccountSearchItem
 {
     /**
      * @var bool
diff --git a/lib/SP/Services/Account/AccountSearchService.php b/lib/SP/Services/Account/AccountSearchService.php
index 11fa7d4f..7c5c27f7 100644
--- a/lib/SP/Services/Account/AccountSearchService.php
+++ b/lib/SP/Services/Account/AccountSearchService.php
@@ -24,8 +24,6 @@
 
 namespace SP\Services\Account;
 
-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountSearchItem;
 use SP\Config\ConfigData;
 use SP\Core\Acl\Acl;
 use SP\DataModel\AccountSearchVData;
@@ -40,15 +38,15 @@ use SP\Services\Service;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Storage\Database\QueryResult;
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;
 
 defined('APP_ROOT') || die();
 
 /**
  * Class AccountSearchService para la gestión de búsquedas de cuentas
  */
-class AccountSearchService extends Service
+final class AccountSearchService extends Service
 {
     /**
      * Regex filters for special searching
@@ -86,6 +84,14 @@ class AccountSearchService extends Service
         '673AB7',
         '3F51B5',
     ];
+    /**
+     * @var AccountFilterUser
+     */
+    private $accountFilterUser;
+    /**
+     * @var AccountAclService
+     */
+    private $accountAclService;
     /**
      * @var ConfigData
      */
@@ -144,7 +150,7 @@ class AccountSearchService extends Service
 
         $accountSearchFilter->setCleanTxtSearch($this->cleanString);
 
-        $accountSearchResponse = $this->accountRepository->getByFilter($accountSearchFilter);
+        $queryResult = $this->accountRepository->getByFilter($accountSearchFilter, $this->accountFilterUser->getFilter($accountSearchFilter->getGlobalSearch()));
 
         // Variables de configuración
         $maxTextLength = $this->configData->isResultsAsCards() ? 40 : 60;
@@ -152,15 +158,14 @@ class AccountSearchService extends Service
         $accountLinkEnabled = $this->context->getUserData()->getPreferences()->isAccountLink() || $this->configData->isAccountLink();
         $favorites = $this->dic->get(AccountToFavoriteService::class)->getForUserId($this->context->getUserData()->getId());
 
-        $accountAclService = $this->dic->get(AccountAclService::class);
-
         $accountsData = [];
 
-        foreach ($accountSearchResponse->getData() as $accountSearchData) {
+        /** @var AccountSearchVData $accountSearchData */
+        foreach ($queryResult->getDataAsArray() as $accountSearchData) {
             $cache = $this->getCacheForAccount($accountSearchData);
 
             // Obtener la ACL de la cuenta
-            $accountAcl = $accountAclService->getAcl(
+            $accountAcl = $this->accountAclService->getAcl(
                 Acl::ACCOUNT_SEARCH,
                 AccountAclDto::makeFromAccountSearch($accountSearchData, $cache->getUsers(), $cache->getUserGroups())
             );
@@ -182,7 +187,7 @@ class AccountSearchService extends Service
             $accountsData[] = $accountsSearchItem;
         }
 
-        return QueryResult::fromResults($accountsData, $accountSearchResponse->getCount());
+        return QueryResult::fromResults($accountsData, $queryResult->getTotalNumRows());
     }
 
     /**
@@ -392,6 +397,8 @@ class AccountSearchService extends Service
         $this->accountToUserRepository = $this->dic->get(AccountToUserRepository::class);
         $this->accountToUserGroupRepository = $this->dic->get(AccountToUserGroupRepository::class);
         $this->fileCache = $this->dic->get(FileCache::class);
+        $this->accountAclService = $this->dic->get(AccountAclService::class);
+        $this->accountFilterUser = $this->dic->get(AccountFilterUser::class);
         $this->configData = $this->config->getConfigData();
 
         $this->loadColors();
diff --git a/lib/SP/Services/Account/AccountService.php b/lib/SP/Services/Account/AccountService.php
index 063a8349..c9a3f0cc 100644
--- a/lib/SP/Services/Account/AccountService.php
+++ b/lib/SP/Services/Account/AccountService.php
@@ -25,17 +25,14 @@
 namespace SP\Services\Account;
 
 use Defuse\Crypto\Exception\CryptoException;
-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountUtil;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\AccountData;
 use SP\DataModel\AccountPassData;
+use SP\DataModel\AccountSearchVData;
 use SP\DataModel\Dto\AccountDetailsResponse;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
-use SP\DataModel\Dto\AccountSearchResponse;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountRepository;
 use SP\Repositories\Account\AccountToTagRepository;
@@ -53,7 +50,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\Account
  */
-class AccountService extends Service implements AccountServiceInterface
+final class AccountService extends Service implements AccountServiceInterface
 {
     use ServiceItemTrait;
 
@@ -169,7 +166,9 @@ class AccountService extends Service implements AccountServiceInterface
      */
     public function getPasswordForId($id)
     {
-        $result = $this->accountRepository->getPasswordForId($id);
+        $queryFilter = $this->dic->get(AccountFilterUser::class)->getFilter();
+
+        $result = $this->accountRepository->getPasswordForId($id, $queryFilter);
 
         if ($result->getNumRows() === 0) {
             throw new NoSuchItemException(__u('Cuenta no encontrada'));
@@ -461,7 +460,7 @@ class AccountService extends Service implements AccountServiceInterface
      */
     public function getForUser($accountId = null)
     {
-        $queryFilter = AccountUtil::getAccountFilterUser($this->context);
+        $queryFilter = $this->dic->get(AccountFilterUser::class)->getFilter();
 
         if (null !== $accountId) {
             $queryFilter->addFilter('Account.id <> ? AND (Account.parentId = 0 OR Account.parentId IS NULL)', [$accountId]);
@@ -479,8 +478,9 @@ class AccountService extends Service implements AccountServiceInterface
      */
     public function getLinked($accountId)
     {
-        $queryFilter = AccountUtil::getAccountFilterUser($this->context)
-            ->addFilter('Account.parentId = ?', [$accountId]);
+        $queryFilter = $this->dic->get(AccountFilterUser::class)->getFilter();
+
+        $queryFilter->addFilter('Account.parentId = ?', [$accountId]);
 
         return $this->accountRepository->getLinked($queryFilter)->getDataAsArray();
     }
@@ -495,8 +495,8 @@ class AccountService extends Service implements AccountServiceInterface
      */
     public function getPasswordHistoryForId($id)
     {
-        $queryFilter = AccountUtil::getAccountHistoryFilterUser($this->context)
-            ->addFilter('AccountHistory.id = ?', [$id]);
+        $queryFilter = $this->dic->get(AccountFilterUser::class)->getFilterHistory();
+        $queryFilter->addFilter('AccountHistory.id = ?', [$id]);
 
         $result = $this->accountRepository->getPasswordHistoryForId($queryFilter);
 
@@ -579,14 +579,19 @@ class AccountService extends Service implements AccountServiceInterface
      *
      * @param AccountSearchFilter $accountSearchFilter
      *
-     * @return AccountSearchResponse
+     * @return AccountSearchVData[]
      * @throws QueryException
      * @throws SPException
      * @throws \SP\Core\Exceptions\ConstraintException
      */
     public function getByFilter(AccountSearchFilter $accountSearchFilter)
     {
-        return $this->accountRepository->getByFilter($accountSearchFilter);
+        $accountFilterUser = $this->dic->get(AccountFilterUser::class);
+
+        return $this->accountRepository->getByFilter(
+            $accountSearchFilter,
+            $accountFilterUser->getFilter($accountSearchFilter->getGlobalSearch())
+        )->getDataAsArray();
     }
 
     /**
diff --git a/lib/SP/Services/Account/AccountServiceInterface.php b/lib/SP/Services/Account/AccountServiceInterface.php
index 7406bace..c5a9a22a 100644
--- a/lib/SP/Services/Account/AccountServiceInterface.php
+++ b/lib/SP/Services/Account/AccountServiceInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -35,6 +35,7 @@ interface AccountServiceInterface
 {
     /**
      * @param int $id
+     *
      * @return AccountDetailsResponse
      * @throws \SP\Core\Exceptions\SPException
      */
diff --git a/lib/SP/Services/Account/AccountToFavoriteService.php b/lib/SP/Services/Account/AccountToFavoriteService.php
index a53207d6..dc16fade 100644
--- a/lib/SP/Services/Account/AccountToFavoriteService.php
+++ b/lib/SP/Services/Account/AccountToFavoriteService.php
@@ -32,7 +32,7 @@ use SP\Services\Service;
  *
  * @package SP\Services\Account
  */
-class AccountToFavoriteService extends Service
+final class AccountToFavoriteService extends Service
 {
     /**
      * @var AccountToFavoriteRepository
diff --git a/lib/SP/Services/Account/AccountToTagService.php b/lib/SP/Services/Account/AccountToTagService.php
index 436b60df..d9e69008 100644
--- a/lib/SP/Services/Account/AccountToTagService.php
+++ b/lib/SP/Services/Account/AccountToTagService.php
@@ -33,7 +33,7 @@ use SP\Services\Service;
  *
  * @package SP\Services\Account
  */
-class AccountToTagService extends Service
+final class AccountToTagService extends Service
 {
     /**
      * @var AccountToTagRepository
diff --git a/lib/SP/Services/Api/ApiRequest.php b/lib/SP/Services/Api/ApiRequest.php
index 10ddaf1a..5190b752 100644
--- a/lib/SP/Services/Api/ApiRequest.php
+++ b/lib/SP/Services/Api/ApiRequest.php
@@ -29,7 +29,7 @@ namespace SP\Services\Api;
  *
  * @package SP\Services\Api
  */
-class ApiRequest
+final class ApiRequest
 {
     /**
      * @var string
diff --git a/lib/SP/Services/Api/ApiRequestData.php b/lib/SP/Services/Api/ApiRequestData.php
index dc7c5043..e0aa6792 100644
--- a/lib/SP/Services/Api/ApiRequestData.php
+++ b/lib/SP/Services/Api/ApiRequestData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -32,7 +32,7 @@ use SP\Core\DataCollection;
  *
  * @package SP\Services\Api
  */
-class ApiRequestData extends DataCollection
+final class ApiRequestData extends DataCollection
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Api/ApiRequestException.php b/lib/SP/Services/Api/ApiRequestException.php
index 207fac44..4924ce59 100644
--- a/lib/SP/Services/Api/ApiRequestException.php
+++ b/lib/SP/Services/Api/ApiRequestException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services\Api
  */
-class ApiRequestException extends SPException
+final class ApiRequestException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Api/ApiResponse.php b/lib/SP/Services/Api/ApiResponse.php
index e09de76f..07d1f92b 100644
--- a/lib/SP/Services/Api/ApiResponse.php
+++ b/lib/SP/Services/Api/ApiResponse.php
@@ -26,9 +26,10 @@ namespace SP\Services\Api;
 
 /**
  * Class ApiResponse
+ *
  * @package SP\Api
  */
-class ApiResponse
+final class ApiResponse
 {
     const RESULT_SUCCESS = 0;
     const RESULT_ERROR = 1;
@@ -48,9 +49,10 @@ class ApiResponse
 
     /**
      * ApiResponse constructor.
+     *
      * @param mixed $result
-     * @param int $resultCode
-     * @param null $itemId
+     * @param int   $resultCode
+     * @param null  $itemId
      */
     public function __construct($result, $resultCode = self::RESULT_SUCCESS, $itemId = null)
     {
diff --git a/lib/SP/Services/Api/ApiService.php b/lib/SP/Services/Api/ApiService.php
index 33892eeb..54f62a6b 100644
--- a/lib/SP/Services/Api/ApiService.php
+++ b/lib/SP/Services/Api/ApiService.php
@@ -42,7 +42,7 @@ use SP\Services\UserProfile\UserProfileService;
  *
  * @package SP\Services\ApiService
  */
-class ApiService extends Service
+final class ApiService extends Service
 {
     /**
      * @var AuthTokenService
diff --git a/lib/SP/Services/Api/JsonRpcResponse.php b/lib/SP/Services/Api/JsonRpcResponse.php
index 4aa7fe4b..d0aaf4c4 100644
--- a/lib/SP/Services/Api/JsonRpcResponse.php
+++ b/lib/SP/Services/Api/JsonRpcResponse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,13 +29,15 @@ use SP\Util\Json;
 
 /**
  * Class JsonRpcResponse
+ *
  * @package SP\Api
  */
-class JsonRpcResponse
+final class JsonRpcResponse
 {
     /**
      * @param ApiResponse $apiResponse
-     * @param $id
+     * @param             $id
+     *
      * @return string
      * @throws \SP\Core\Exceptions\SPException
      */
@@ -50,7 +52,8 @@ class JsonRpcResponse
 
     /**
      * @param \Exception $e
-     * @param $id
+     * @param            $id
+     *
      * @return string
      */
     public static function getResponseException(\Exception $e, $id)
diff --git a/lib/SP/Services/Auth/AuthException.php b/lib/SP/Services/Auth/AuthException.php
index a2988781..492b0ca0 100644
--- a/lib/SP/Services/Auth/AuthException.php
+++ b/lib/SP/Services/Auth/AuthException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services\Auth
  */
-class AuthException extends SPException
+final class AuthException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Auth/LoginResponse.php b/lib/SP/Services/Auth/LoginResponse.php
index 3648273e..133a36a1 100644
--- a/lib/SP/Services/Auth/LoginResponse.php
+++ b/lib/SP/Services/Auth/LoginResponse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\Auth;
  *
  * @package SP\Services\Auth
  */
-class LoginResponse
+final class LoginResponse
 {
     /**
      * @var int
@@ -42,7 +42,8 @@ class LoginResponse
 
     /**
      * LoginResponse constructor.
-     * @param int $status
+     *
+     * @param int    $status
      * @param string $redirect
      */
     public function __construct($status, $redirect = null)
diff --git a/lib/SP/Services/Auth/LoginService.php b/lib/SP/Services/Auth/LoginService.php
index 569ff38f..1d93b49a 100644
--- a/lib/SP/Services/Auth/LoginService.php
+++ b/lib/SP/Services/Auth/LoginService.php
@@ -57,7 +57,7 @@ use SP\Util\Util;
  *
  * @package SP\Services
  */
-class LoginService extends Service
+final class LoginService extends Service
 {
     /**
      * Estados
@@ -579,10 +579,12 @@ class LoginService extends Service
      */
     protected function authBrowser(BrowserAuthData $authData)
     {
+        $authType = $this->request->getServer('AUTH_TYPE') ?: __('N/D');
+
         $eventMessage = EventMessage::factory()
             ->addDetail(__u('Tipo'), __FUNCTION__)
             ->addDetail(__u('Usuario'), $this->userLoginData->getLoginUser())
-            ->addDetail(__u('Autentificación'), sprintf('%s (%s)', AuthUtil::getServerAuthType(), $authData->getName()));
+            ->addDetail(__u('Autentificación'), sprintf('%s (%s)', $authType, $authData->getName()));
 
         // Comprobar si concide el login con la autentificación del servidor web
         if ($authData->getAuthenticated() === false) {
diff --git a/lib/SP/Services/AuthToken/AuthTokenService.php b/lib/SP/Services/AuthToken/AuthTokenService.php
index 0744306a..06dff51f 100644
--- a/lib/SP/Services/AuthToken/AuthTokenService.php
+++ b/lib/SP/Services/AuthToken/AuthTokenService.php
@@ -44,7 +44,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\AuthToken
  */
-class AuthTokenService extends Service
+final class AuthTokenService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/Backup/FileBackupService.php b/lib/SP/Services/Backup/FileBackupService.php
index 1796d618..05dbbff5 100644
--- a/lib/SP/Services/Backup/FileBackupService.php
+++ b/lib/SP/Services/Backup/FileBackupService.php
@@ -31,9 +31,9 @@ use SP\Core\Exceptions\SPException;
 use SP\Services\Service;
 use SP\Services\ServiceException;
 use SP\Storage\Database\Database;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\QueryData;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileHandler;
 use SP\Util\Checks;
 use SP\Util\Util;
 
@@ -42,7 +42,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de realizar la copia de sysPass.
  */
-class FileBackupService extends Service
+final class FileBackupService extends Service
 {
     /**
      * @var ConfigData
@@ -144,11 +144,11 @@ class FileBackupService extends Service
      * Backup de las tablas de la BBDD.
      * Utilizar '*' para toda la BBDD o 'table1 table2 table3...'
      *
-     * @param string|array $tables
-     * @param FileHandler  $fileHandler
+     * @param string|array                 $tables
+     * @param \SP\Storage\File\FileHandler $fileHandler
      *
      * @throws \Exception
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     private function backupTables($tables = '*', FileHandler $fileHandler)
     {
@@ -164,7 +164,7 @@ class FileBackupService extends Service
         $queryData = new QueryData();
 
         if ($tables === '*') {
-            $resTables = DBUtil::$tables;
+            $resTables = DatabaseUtil::$tables;
         } else {
             $resTables = is_array($tables) ? $tables : explode(',', $tables);
         }
@@ -241,7 +241,7 @@ class FileBackupService extends Service
                     if (is_numeric($value)) {
                         $fileHandler->write($value);
                     } else {
-                        $fileHandler->write(DBUtil::escape($value, $db->getDbHandler()));
+                        $fileHandler->write(DatabaseUtil::escape($value, $db->getDbHandler()));
                     }
 
                     if ($field < $numColumns) {
diff --git a/lib/SP/Services/Category/CategoryService.php b/lib/SP/Services/Category/CategoryService.php
index b8af92c0..06cf50c3 100644
--- a/lib/SP/Services/Category/CategoryService.php
+++ b/lib/SP/Services/Category/CategoryService.php
@@ -40,7 +40,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\Category
  */
-class CategoryService extends Service
+final class CategoryService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/Client/ClientService.php b/lib/SP/Services/Client/ClientService.php
index db375480..2a50dbe6 100644
--- a/lib/SP/Services/Client/ClientService.php
+++ b/lib/SP/Services/Client/ClientService.php
@@ -24,7 +24,6 @@
 
 namespace SP\Services\Client;
 
-use SP\Account\AccountUtil;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\ClientData;
 use SP\DataModel\ItemData;
@@ -32,6 +31,7 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\Client\ClientRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\NoSuchItemException;
+use SP\Services\Account\AccountFilterUser;
 use SP\Services\Service;
 use SP\Services\ServiceException;
 use SP\Services\ServiceItemTrait;
@@ -41,7 +41,7 @@ use SP\Services\ServiceItemTrait;
  *
  * @package SP\Services\Client
  */
-class ClientService extends Service
+final class ClientService extends Service
 {
     use ServiceItemTrait;
 
@@ -176,7 +176,7 @@ class ClientService extends Service
      */
     public function getAllForUser()
     {
-        return $this->clientRepository->getAllForFilter(AccountUtil::getAccountFilterUser($this->context))->getDataAsArray();
+        return $this->clientRepository->getAllForFilter($this->dic->get(AccountFilterUser::class)->getFilter())->getDataAsArray();
     }
 
     /**
diff --git a/lib/SP/Services/Config/ConfigBackupService.php b/lib/SP/Services/Config/ConfigBackupService.php
index 93823be5..a6185be0 100644
--- a/lib/SP/Services/Config/ConfigBackupService.php
+++ b/lib/SP/Services/Config/ConfigBackupService.php
@@ -35,7 +35,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Config
  */
-class ConfigBackupService extends Service
+final class ConfigBackupService extends Service
 {
     /**
      * @var ConfigService
diff --git a/lib/SP/Services/Config/ConfigService.php b/lib/SP/Services/Config/ConfigService.php
index 65b73173..4a571663 100644
--- a/lib/SP/Services/Config/ConfigService.php
+++ b/lib/SP/Services/Config/ConfigService.php
@@ -38,7 +38,7 @@ use SP\Services\ServiceException;
  *
  * @package SP\Services\Config
  */
-class ConfigService extends Service
+final class ConfigService extends Service
 {
     /**
      * @var ConfigRepository
diff --git a/lib/SP/Services/Crypt/MasterPassService.php b/lib/SP/Services/Crypt/MasterPassService.php
index f147fc23..ee8e054d 100644
--- a/lib/SP/Services/Crypt/MasterPassService.php
+++ b/lib/SP/Services/Crypt/MasterPassService.php
@@ -36,7 +36,7 @@ use SP\Services\ServiceException;
  *
  * @package SP\Services\Crypt
  */
-class MasterPassService extends Service
+final class MasterPassService extends Service
 {
     const PARAM_MASTER_PASS_TIME = 'lastupdatempass';
     const PARAM_MASTER_PASS_HASH = 'masterPwd';
diff --git a/lib/SP/Services/Crypt/SecureSessionService.php b/lib/SP/Services/Crypt/SecureSessionService.php
index 1e97da4d..f7f203c9 100644
--- a/lib/SP/Services/Crypt/SecureSessionService.php
+++ b/lib/SP/Services/Crypt/SecureSessionService.php
@@ -30,15 +30,15 @@ use SP\Core\Crypt\Vault;
 use SP\Http\Request;
 use SP\Services\Service;
 use SP\Services\ServiceException;
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;
 
 /**
  * Class SecureSessionService
  *
  * @package SP\Services\Crypt
  */
-class SecureSessionService extends Service
+final class SecureSessionService extends Service
 {
     const CACHE_EXPIRE_TIME = 86400;
     const CACHE_PATH = CACHE_PATH . DIRECTORY_SEPARATOR . 'secure_session';
diff --git a/lib/SP/Services/Crypt/TemporaryMasterPassService.php b/lib/SP/Services/Crypt/TemporaryMasterPassService.php
index 1f45a91c..3739986a 100644
--- a/lib/SP/Services/Crypt/TemporaryMasterPassService.php
+++ b/lib/SP/Services/Crypt/TemporaryMasterPassService.php
@@ -32,7 +32,7 @@ use SP\Core\Messages\MailMessage;
 use SP\DataModel\Dto\ConfigRequest;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Config\ConfigService;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SP\Services\Service;
 use SP\Services\ServiceException;
 use SP\Services\User\UserService;
@@ -43,7 +43,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Crypt
  */
-class TemporaryMasterPassService extends Service
+final class TemporaryMasterPassService extends Service
 {
     /**
      * Número máximo de intentos
diff --git a/lib/SP/Services/Crypt/UpdateMasterPassRequest.php b/lib/SP/Services/Crypt/UpdateMasterPassRequest.php
index 156b4265..85552fb8 100644
--- a/lib/SP/Services/Crypt/UpdateMasterPassRequest.php
+++ b/lib/SP/Services/Crypt/UpdateMasterPassRequest.php
@@ -33,7 +33,7 @@ use SP\Services\Task\Task;
  *
  * @package SP\Services\Crypt
  */
-class UpdateMasterPassRequest
+final class UpdateMasterPassRequest
 {
     /**
      * @var string
diff --git a/lib/SP/Services/CustomField/CustomFieldCryptService.php b/lib/SP/Services/CustomField/CustomFieldCryptService.php
index 2cb6ecac..25f8a261 100644
--- a/lib/SP/Services/CustomField/CustomFieldCryptService.php
+++ b/lib/SP/Services/CustomField/CustomFieldCryptService.php
@@ -40,7 +40,7 @@ use SP\Services\Task\TaskFactory;
  *
  * @package SP\Mgmt\CustomFields
  */
-class CustomFieldCryptService extends Service
+final class CustomFieldCryptService extends Service
 {
     /**
      * @var CustomFieldService
@@ -115,6 +115,7 @@ class CustomFieldCryptService extends Service
      * Actualizar los datos encriptados con una nueva clave
      *
      * @param UpdateMasterPassRequest $request
+     *
      * @throws ServiceException
      */
     public function updateMasterPassword(UpdateMasterPassRequest $request)
diff --git a/lib/SP/Services/CustomField/CustomFieldDefService.php b/lib/SP/Services/CustomField/CustomFieldDefService.php
index 792db71e..fc0a0f9b 100644
--- a/lib/SP/Services/CustomField/CustomFieldDefService.php
+++ b/lib/SP/Services/CustomField/CustomFieldDefService.php
@@ -38,7 +38,7 @@ use SP\Services\ServiceItemTrait;
  *
  * @package SP\Services\CustomField
  */
-class CustomFieldDefService extends Service
+final class CustomFieldDefService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/CustomField/CustomFieldItem.php b/lib/SP/Services/CustomField/CustomFieldItem.php
index 9182e052..71111d98 100644
--- a/lib/SP/Services/CustomField/CustomFieldItem.php
+++ b/lib/SP/Services/CustomField/CustomFieldItem.php
@@ -29,7 +29,7 @@ namespace SP\Services\CustomField;
  *
  * @package SP\Services\CustomField
  */
-class CustomFieldItem
+final class CustomFieldItem
 {
     public $required = false;
     public $showInList = false;
diff --git a/lib/SP/Services/CustomField/CustomFieldService.php b/lib/SP/Services/CustomField/CustomFieldService.php
index 1b36b950..da4638fc 100644
--- a/lib/SP/Services/CustomField/CustomFieldService.php
+++ b/lib/SP/Services/CustomField/CustomFieldService.php
@@ -38,7 +38,7 @@ use SP\Services\ServiceException;
  *
  * @package SP\Services\CustomField
  */
-class CustomFieldService extends Service
+final class CustomFieldService extends Service
 {
     /**
      * @var CustomFieldRepository
diff --git a/lib/SP/Services/CustomField/CustomFieldTypeService.php b/lib/SP/Services/CustomField/CustomFieldTypeService.php
index 6107f3cb..687ca39e 100644
--- a/lib/SP/Services/CustomField/CustomFieldTypeService.php
+++ b/lib/SP/Services/CustomField/CustomFieldTypeService.php
@@ -26,6 +26,7 @@ namespace SP\Services\CustomField;
 
 use SP\DataModel\CustomFieldTypeData;
 use SP\Repositories\CustomField\CustomFieldTypeRepository;
+use SP\Repositories\NoSuchItemException;
 use SP\Services\Service;
 use SP\Services\ServiceItemTrait;
 
@@ -34,7 +35,7 @@ use SP\Services\ServiceItemTrait;
  *
  * @package SP\Services\CustomField
  */
-class CustomFieldTypeService extends Service
+final class CustomFieldTypeService extends Service
 {
     use ServiceItemTrait;
 
@@ -43,28 +44,51 @@ class CustomFieldTypeService extends Service
      */
     protected $customFieldTypeRepository;
 
+    /**
+     * Get all items from the service's repository
+     *
+     * @return CustomFieldTypeData[]
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
+     */
+    public function getAllBasic()
+    {
+        return $this->getAll();
+    }
+
     /**
      * Returns all the items
      *
      * @return CustomFieldTypeData[]
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
      */
     public function getAll()
     {
-        return $this->customFieldTypeRepository->getAll();
+        return $this->customFieldTypeRepository->getAll()->getDataAsArray();
+    }
+
+    /**
+     * @param $id
+     *
+     * @return mixed
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
+     * @throws NoSuchItemException
+     */
+    public function getById($id)
+    {
+        $result = $this->customFieldTypeRepository->getById($id);
+
+        if ($result->getNumRows() === 0) {
+            throw new NoSuchItemException(__u('Tipo de campo no encontrado'));
+        }
+
+        return $result->getData();
     }
 
     protected function initialize()
     {
         $this->customFieldTypeRepository = $this->dic->get(CustomFieldTypeRepository::class);
     }
-
-    /**
-     * Get all items from the service's repository
-     *
-     * @return CustomFieldTypeData[]
-     */
-    public function getAllBasic()
-    {
-        return $this->getAll();
-    }
 }
\ No newline at end of file
diff --git a/lib/SP/Services/EventLog/EventlogService.php b/lib/SP/Services/EventLog/EventlogService.php
index db8a0219..3eaeef63 100644
--- a/lib/SP/Services/EventLog/EventlogService.php
+++ b/lib/SP/Services/EventLog/EventlogService.php
@@ -36,7 +36,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\EventLog
  */
-class EventlogService extends Service
+final class EventlogService extends Service
 {
     /**
      * @var EventlogRepository
@@ -72,6 +72,7 @@ class EventlogService extends Service
 
     /**
      * @param EventlogData $eventlogData
+     *
      * @return int
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
diff --git a/lib/SP/Services/Export/VerifyResult.php b/lib/SP/Services/Export/VerifyResult.php
index adceaa08..9873d597 100644
--- a/lib/SP/Services/Export/VerifyResult.php
+++ b/lib/SP/Services/Export/VerifyResult.php
@@ -30,7 +30,7 @@ namespace SP\Services\Export;
  *
  * @package SP\Services\Export
  */
-class VerifyResult
+final class VerifyResult
 {
     /**
      * @var string
diff --git a/lib/SP/Services/Export/XmlExportService.php b/lib/SP/Services/Export/XmlExportService.php
index ba9d9f43..c2857e9c 100644
--- a/lib/SP/Services/Export/XmlExportService.php
+++ b/lib/SP/Services/Export/XmlExportService.php
@@ -49,7 +49,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class XmlExportService extends Service
+final class XmlExportService extends Service
 {
     /**
      * @var ConfigData
diff --git a/lib/SP/Services/Export/XmlVerifyService.php b/lib/SP/Services/Export/XmlVerifyService.php
index c38d61be..cdbbe3a1 100644
--- a/lib/SP/Services/Export/XmlVerifyService.php
+++ b/lib/SP/Services/Export/XmlVerifyService.php
@@ -32,7 +32,7 @@ use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\Hash;
 use SP\Services\Service;
 use SP\Services\ServiceException;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileHandler;
 
 /**
  * Class XmlVerifyService
@@ -41,7 +41,7 @@ use SP\Storage\FileHandler;
  *
  * @package SP\Services\Export
  */
-class XmlVerifyService extends Service
+final class XmlVerifyService extends Service
 {
     const NODES = ['Category', 'Client', 'Tag', 'Account'];
     /**
@@ -62,7 +62,7 @@ class XmlVerifyService extends Service
      *
      * @return VerifyResult
      * @throws ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function verify(string $xmlFile): VerifyResult
     {
@@ -77,7 +77,7 @@ class XmlVerifyService extends Service
 
     /**
      * @throws ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     private function setup()
     {
@@ -88,7 +88,7 @@ class XmlVerifyService extends Service
      * Leer el archivo a un objeto XML.
      *
      * @throws ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     protected function readXmlFile()
     {
@@ -103,7 +103,7 @@ class XmlVerifyService extends Service
             foreach (libxml_get_errors() as $error) {
                 debugLog(__METHOD__ . ' - ' . $error->message);
             }
-            
+
             throw new ServiceException(
                 __u('Error interno'),
                 ServiceException::ERROR,
@@ -165,7 +165,7 @@ class XmlVerifyService extends Service
      *
      * @return VerifyResult
      * @throws ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      * @throws CryptoException
      */
     public function verifyEncrypted(string $xmlFile, string $password): VerifyResult
diff --git a/lib/SP/Services/Import/CsvImport.php b/lib/SP/Services/Import/CsvImport.php
index 6286c023..56bb08db 100644
--- a/lib/SP/Services/Import/CsvImport.php
+++ b/lib/SP/Services/Import/CsvImport.php
@@ -34,14 +34,14 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class CsvImport extends CsvImportBase implements ImportInterface
+final class CsvImport extends CsvImportBase implements ImportInterface
 {
     /**
      * Iniciar la importación desde CSV
      *
      * @return $this|ImportInterface
      * @throws ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function doImport()
     {
diff --git a/lib/SP/Services/Import/CsvImportBase.php b/lib/SP/Services/Import/CsvImportBase.php
index d0e41b29..05d88134 100644
--- a/lib/SP/Services/Import/CsvImportBase.php
+++ b/lib/SP/Services/Import/CsvImportBase.php
@@ -25,12 +25,12 @@
 namespace SP\Services\Import;
 
 use DI\Container;
-use SP\Account\AccountRequest;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventDispatcher;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\CategoryData;
 use SP\DataModel\ClientData;
+use SP\Services\Account\AccountRequest;
 use SP\Services\Account\AccountService;
 use SP\Services\Category\CategoryService;
 use SP\Services\Client\ClientService;
@@ -114,7 +114,7 @@ abstract class CsvImportBase
      * Obtener los datos de las entradas de sysPass y crearlas
      *
      * @throws ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     protected function processAccounts()
     {
diff --git a/lib/SP/Services/Import/FileImport.php b/lib/SP/Services/Import/FileImport.php
index 453cb410..47643ab8 100644
--- a/lib/SP/Services/Import/FileImport.php
+++ b/lib/SP/Services/Import/FileImport.php
@@ -25,8 +25,8 @@
 namespace SP\Services\Import;
 
 use SP\Http\Request;
-use SP\Storage\FileException;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileHandler;
 use SP\Util\Util;
 
 defined('APP_ROOT') || die();
@@ -36,17 +36,17 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class FileImport
+final class FileImport
 {
     /**
-     * @var FileHandler
+     * @var \SP\Storage\File\FileHandler
      */
     private $fileHandler;
 
     /**
      * FileImport constructor.
      *
-     * @param FileHandler $fileHandler Datos del archivo a importar
+     * @param \SP\Storage\File\FileHandler $fileHandler Datos del archivo a importar
      */
     private function __construct(FileHandler $fileHandler)
     {
@@ -79,7 +79,7 @@ class FileImport
      * @param array $fileData con los datos del archivo
      *
      * @return string
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     private static function checkFile($fileData): string
     {
@@ -182,7 +182,7 @@ class FileImport
     }
 
     /**
-     * @return FileHandler
+     * @return \SP\Storage\File\FileHandler
      */
     public function getFileHandler(): FileHandler
     {
diff --git a/lib/SP/Services/Import/ImportException.php b/lib/SP/Services/Import/ImportException.php
index 35b60442..4d3ed663 100644
--- a/lib/SP/Services/Import/ImportException.php
+++ b/lib/SP/Services/Import/ImportException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services\Import
  */
-class ImportException extends SPException
+final class ImportException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Import/ImportInterface.php b/lib/SP/Services/Import/ImportInterface.php
index f22b4044..01a199c8 100644
--- a/lib/SP/Services/Import/ImportInterface.php
+++ b/lib/SP/Services/Import/ImportInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Services/Import/ImportParams.php b/lib/SP/Services/Import/ImportParams.php
index e85f50c9..0aef011e 100644
--- a/lib/SP/Services/Import/ImportParams.php
+++ b/lib/SP/Services/Import/ImportParams.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -30,7 +30,7 @@ namespace SP\Services\Import;
  *
  * @package SP\Services\Import
  */
-class ImportParams
+final class ImportParams
 {
     /**
      * @var string
diff --git a/lib/SP/Services/Import/ImportService.php b/lib/SP/Services/Import/ImportService.php
index 365a546e..f6668a22 100644
--- a/lib/SP/Services/Import/ImportService.php
+++ b/lib/SP/Services/Import/ImportService.php
@@ -32,7 +32,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de importar cuentas.
  */
-class ImportService extends Service
+final class ImportService extends Service
 {
     /**
      * @var ImportParams
@@ -71,7 +71,7 @@ class ImportService extends Service
      * @throws ImportException
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     protected function selectImportType()
     {
diff --git a/lib/SP/Services/Import/ImportTrait.php b/lib/SP/Services/Import/ImportTrait.php
index b3370318..ecfbef68 100644
--- a/lib/SP/Services/Import/ImportTrait.php
+++ b/lib/SP/Services/Import/ImportTrait.php
@@ -24,7 +24,6 @@
 
 namespace SP\Services\Import;
 
-use SP\Account\AccountRequest;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\OldCrypt;
 use SP\Core\Exceptions\SPException;
@@ -32,6 +31,7 @@ use SP\DataModel\CategoryData;
 use SP\DataModel\ClientData;
 use SP\DataModel\TagData;
 use SP\Repositories\DuplicatedItemException;
+use SP\Services\Account\AccountRequest;
 use SP\Services\Account\AccountService;
 use SP\Services\Category\CategoryService;
 use SP\Services\Client\ClientService;
diff --git a/lib/SP/Services/Import/KeepassImport.php b/lib/SP/Services/Import/KeepassImport.php
index a84ff9fb..490d93c7 100644
--- a/lib/SP/Services/Import/KeepassImport.php
+++ b/lib/SP/Services/Import/KeepassImport.php
@@ -26,11 +26,11 @@ namespace SP\Services\Import;
 
 use DOMElement;
 use DOMXPath;
-use SP\Account\AccountRequest;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\CategoryData;
 use SP\DataModel\ClientData;
+use SP\Services\Account\AccountRequest;
 use SP\Util\Filter;
 
 defined('APP_ROOT') || die();
@@ -38,7 +38,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de importar cuentas desde KeePass
  */
-class KeepassImport extends XmlImportBase implements ImportInterface
+final class KeepassImport extends XmlImportBase implements ImportInterface
 {
     /**
      * @var array
@@ -81,7 +81,7 @@ class KeepassImport extends XmlImportBase implements ImportInterface
 
         $this->getEntries();
 
-        /** @var AccountRequest[] $group */
+        /** @var \SP\Services\Account\AccountRequest[] $group */
         foreach ($this->items as $group => $entry) {
             try {
                 $categoryId = $this->addCategory(new CategoryData(null, $group, 'KeePass'));
@@ -164,7 +164,7 @@ class KeepassImport extends XmlImportBase implements ImportInterface
     /**
      * @param array $entry
      *
-     * @return AccountRequest
+     * @return \SP\Services\Account\AccountRequest
      */
     private function mapEntryToAccount(array $entry)
     {
diff --git a/lib/SP/Services/Import/SyspassImport.php b/lib/SP/Services/Import/SyspassImport.php
index 9dde5240..befd1cd4 100644
--- a/lib/SP/Services/Import/SyspassImport.php
+++ b/lib/SP/Services/Import/SyspassImport.php
@@ -26,7 +26,6 @@ namespace SP\Services\Import;
 
 use Defuse\Crypto\Exception\CryptoException;
 use DOMXPath;
-use SP\Account\AccountRequest;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\Hash;
 use SP\Core\Crypt\OldCrypt;
@@ -35,6 +34,7 @@ use SP\Core\Events\EventMessage;
 use SP\DataModel\CategoryData;
 use SP\DataModel\ClientData;
 use SP\DataModel\TagData;
+use SP\Services\Account\AccountRequest;
 use SP\Services\Export\XmlVerifyService;
 
 defined('APP_ROOT') || die();
@@ -42,7 +42,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de importar cuentas desde sysPass
  */
-class SyspassImport extends XmlImportBase implements ImportInterface
+final class SyspassImport extends XmlImportBase implements ImportInterface
 {
     /**
      * Iniciar la importación desde sysPass.
diff --git a/lib/SP/Services/Import/XmlFileImport.php b/lib/SP/Services/Import/XmlFileImport.php
index 66e1de51..c88f4be9 100644
--- a/lib/SP/Services/Import/XmlFileImport.php
+++ b/lib/SP/Services/Import/XmlFileImport.php
@@ -29,7 +29,7 @@ namespace SP\Services\Import;
  *
  * @package Import
  */
-class XmlFileImport
+final class XmlFileImport
 {
     /**
      * @var FileImport
@@ -46,7 +46,7 @@ class XmlFileImport
      * @param FileImport $fileImport
      *
      * @throws ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function __construct(FileImport $fileImport)
     {
@@ -59,7 +59,7 @@ class XmlFileImport
      * Leer el archivo a un objeto XML.
      *
      * @throws ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     protected function readXMLFile()
     {
diff --git a/lib/SP/Services/Import/XmlImport.php b/lib/SP/Services/Import/XmlImport.php
index fd33295f..ca726322 100644
--- a/lib/SP/Services/Import/XmlImport.php
+++ b/lib/SP/Services/Import/XmlImport.php
@@ -34,7 +34,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class XmlImport implements ImportInterface
+final class XmlImport implements ImportInterface
 {
     /**
      * @var FileImport
diff --git a/lib/SP/Services/Import/XmlImportTrait.php b/lib/SP/Services/Import/XmlImportTrait.php
index b38ea178..00a45d01 100644
--- a/lib/SP/Services/Import/XmlImportTrait.php
+++ b/lib/SP/Services/Import/XmlImportTrait.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -55,6 +55,7 @@ trait XmlImportTrait
      * @param string $childNodeName Nombre de los nodos hijos
      * @param string $callback      Método a ejecutar
      * @param bool   $required      Indica si el nodo es requerido
+     *
      * @throws ImportException
      */
     protected function getNodesData($nodeName, $childNodeName, $callback, $required = true)
diff --git a/lib/SP/Services/Install/DatabaseSetupInterface.php b/lib/SP/Services/Install/DatabaseSetupInterface.php
index c2c03d9c..e5f385de 100644
--- a/lib/SP/Services/Install/DatabaseSetupInterface.php
+++ b/lib/SP/Services/Install/DatabaseSetupInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Services/Install/InstallData.php b/lib/SP/Services/Install/InstallData.php
index 58ddb6ed..bf7c627e 100644
--- a/lib/SP/Services/Install/InstallData.php
+++ b/lib/SP/Services/Install/InstallData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\Install;
  *
  * @package SP\DataModel
  */
-class InstallData
+final class InstallData
 {
     /**
      * @var string Usuario de la BD
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index 14823175..e7c50d2d 100644
--- a/lib/SP/Services/Install/Installer.php
+++ b/lib/SP/Services/Install/Installer.php
@@ -47,7 +47,7 @@ defined('APP_ROOT') || die();
 /**
  * Esta clase es la encargada de instalar sysPass.
  */
-class Installer extends Service
+final class Installer extends Service
 {
     /**
      * Versión y número de compilación de sysPass
diff --git a/lib/SP/Services/Install/MySQL.php b/lib/SP/Services/Install/MySQL.php
index 2d20be8d..88e1c7ac 100644
--- a/lib/SP/Services/Install/MySQL.php
+++ b/lib/SP/Services/Install/MySQL.php
@@ -28,10 +28,10 @@ use PDOException;
 use SP\Config\ConfigData;
 use SP\Core\Exceptions\SPException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\MySQLFileParser;
 use SP\Storage\Database\MySQLHandler;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileHandler;
 use SP\Util\Util;
 
 /**
@@ -39,7 +39,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Install
  */
-class MySQL implements DatabaseSetupInterface
+final class MySQL implements DatabaseSetupInterface
 {
     /**
      * @var InstallData
@@ -277,7 +277,7 @@ class MySQL implements DatabaseSetupInterface
         $dbc = $this->dbs->getConnectionSimple();
 
         if ($this->installData->isHostingMode()) {
-            foreach (DBUtil::$tables as $table) {
+            foreach (DatabaseUtil::$tables as $table) {
                 $dbc->exec('DROP TABLE IF EXISTS `' . $this->installData->getDbName() . '`.`' . $table . '`');
             }
         } else {
@@ -352,7 +352,7 @@ class MySQL implements DatabaseSetupInterface
      */
     public function checkConnection()
     {
-        if (!DBUtil::checkDatabaseExist($this->dbs, $this->installData->getDbName())) {
+        if (!DatabaseUtil::checkDatabaseExist($this->dbs, $this->installData->getDbName())) {
             $this->rollback();
 
             throw new SPException(
diff --git a/lib/SP/Services/Ldap/LdapCheckService.php b/lib/SP/Services/Ldap/LdapCheckService.php
index 366ba4d1..5952d85f 100644
--- a/lib/SP/Services/Ldap/LdapCheckService.php
+++ b/lib/SP/Services/Ldap/LdapCheckService.php
@@ -35,7 +35,7 @@ use SP\Services\Service;
  *
  * @package SP\Services\Ldap
  */
-class LdapCheckService extends Service
+final class LdapCheckService extends Service
 {
     /**
      * @var LdapBase
@@ -44,6 +44,7 @@ class LdapCheckService extends Service
 
     /**
      * @param LdapParams $ldapParams
+     *
      * @throws \SP\Providers\Auth\Ldap\LdapException
      */
     public function checkConnection(LdapParams $ldapParams)
@@ -59,6 +60,7 @@ class LdapCheckService extends Service
 
     /**
      * @param bool $includeGroups
+     *
      * @return array
      * @throws \SP\Providers\Auth\Ldap\LdapException
      */
@@ -90,6 +92,7 @@ class LdapCheckService extends Service
      *
      * @param array  $data
      * @param string $attribute
+     *
      * @return array
      */
     public function ldapResultsMapper($data, $attribute = 'dn')
@@ -111,6 +114,7 @@ class LdapCheckService extends Service
 
     /**
      * @param $filter
+     *
      * @return array
      * @throws \SP\Providers\Auth\Ldap\LdapException
      */
diff --git a/lib/SP/Services/Ldap/LdapImportParams.php b/lib/SP/Services/Ldap/LdapImportParams.php
index 138d3186..2945e2ea 100644
--- a/lib/SP/Services/Ldap/LdapImportParams.php
+++ b/lib/SP/Services/Ldap/LdapImportParams.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\Ldap;
  *
  * @package SP\Services\Ldap
  */
-class LdapImportParams
+final class LdapImportParams
 {
     /**
      * @var int
diff --git a/lib/SP/Services/Ldap/LdapImportService.php b/lib/SP/Services/Ldap/LdapImportService.php
index adc10ca4..a4d6aa5f 100644
--- a/lib/SP/Services/Ldap/LdapImportService.php
+++ b/lib/SP/Services/Ldap/LdapImportService.php
@@ -42,7 +42,7 @@ use SP\Services\UserGroup\UserGroupService;
  *
  * @package SP\Services\User
  */
-class LdapImportService extends Service
+final class LdapImportService extends Service
 {
     /**
      * @var int
@@ -84,8 +84,9 @@ class LdapImportService extends Service
     /**
      * Sincronizar usuarios de LDAP
      *
-     * @param LdapParams $ldapParams
+     * @param LdapParams       $ldapParams
      * @param LdapImportParams $ldapImportParams
+     *
      * @throws LdapException
      */
     public function importGroups(LdapParams $ldapParams, LdapImportParams $ldapImportParams)
@@ -165,8 +166,9 @@ class LdapImportService extends Service
     }
 
     /**
-     * @param LdapParams $ldapParams
+     * @param LdapParams       $ldapParams
      * @param LdapImportParams $ldapImportParams
+     *
      * @throws LdapException
      */
     public function importUsers(LdapParams $ldapParams, LdapImportParams $ldapImportParams)
diff --git a/lib/SP/Services/MailService.php b/lib/SP/Services/Mail/MailService.php
similarity index 97%
rename from lib/SP/Services/MailService.php
rename to lib/SP/Services/Mail/MailService.php
index 29f1cd2d..52bd4a6b 100644
--- a/lib/SP/Services/MailService.php
+++ b/lib/SP/Services/Mail/MailService.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Services;
+namespace SP\Services\Mail;
 
 use PHPMailer\PHPMailer\PHPMailer;
 use SP\Bootstrap;
@@ -33,6 +33,8 @@ use SP\Html\Html;
 use SP\Providers\Mail\MailParams;
 use SP\Providers\Mail\MailProvider;
 use SP\Providers\Mail\MailProviderException;
+use SP\Services\Service;
+use SP\Services\ServiceException;
 use SP\Util\Util;
 
 /**
@@ -40,7 +42,7 @@ use SP\Util\Util;
  *
  * @package SP\Services
  */
-class MailService extends Service
+final class MailService extends Service
 {
     /**
      * @var PHPMailer
@@ -137,7 +139,7 @@ class MailService extends Service
     {
         try {
             $this->mailer->send();
-            
+
             $this->eventDispatcher->notifyEvent('send.mail',
                 new Event($this, EventMessage::factory()
                     ->addDescription(__u('Correo enviado'))
diff --git a/lib/SP/Services/Notification/NotificationService.php b/lib/SP/Services/Notification/NotificationService.php
index dad44e26..6f917ad9 100644
--- a/lib/SP/Services/Notification/NotificationService.php
+++ b/lib/SP/Services/Notification/NotificationService.php
@@ -37,7 +37,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\Notification
  */
-class NotificationService extends Service
+final class NotificationService extends Service
 {
     /**
      * @var NotificationRepository
diff --git a/lib/SP/Services/Plugin/PluginService.php b/lib/SP/Services/Plugin/PluginService.php
index 0fa5c059..0b63ceb9 100644
--- a/lib/SP/Services/Plugin/PluginService.php
+++ b/lib/SP/Services/Plugin/PluginService.php
@@ -39,7 +39,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\Plugin
  */
-class PluginService extends Service
+final class PluginService extends Service
 {
     /**
      * @var PluginRepository
diff --git a/lib/SP/Services/PublicLink/PublicLinkKey.php b/lib/SP/Services/PublicLink/PublicLinkKey.php
index 48bd65fd..5fbaafc0 100644
--- a/lib/SP/Services/PublicLink/PublicLinkKey.php
+++ b/lib/SP/Services/PublicLink/PublicLinkKey.php
@@ -31,7 +31,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\PublicLink
  */
-class PublicLinkKey
+final class PublicLinkKey
 {
     /**
      * @var string
diff --git a/lib/SP/Services/PublicLink/PublicLinkService.php b/lib/SP/Services/PublicLink/PublicLinkService.php
index e9e9ce9b..ebe2e83b 100644
--- a/lib/SP/Services/PublicLink/PublicLinkService.php
+++ b/lib/SP/Services/PublicLink/PublicLinkService.php
@@ -46,7 +46,7 @@ use SP\Storage\Database\QueryResult;
  *
  * @package SP\Services\PublicLink
  */
-class PublicLinkService extends Service
+final class PublicLinkService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/ServiceException.php b/lib/SP/Services/ServiceException.php
index 4f371d10..250e0bd6 100644
--- a/lib/SP/Services/ServiceException.php
+++ b/lib/SP/Services/ServiceException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -32,7 +32,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services
  */
-class ServiceException extends SPException
+final class ServiceException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/ServiceItemInterface.php b/lib/SP/Services/ServiceItemInterface.php
index eb7df583..41e6aa7c 100644
--- a/lib/SP/Services/ServiceItemInterface.php
+++ b/lib/SP/Services/ServiceItemInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/lib/SP/Services/Tag/TagService.php b/lib/SP/Services/Tag/TagService.php
index 7e073fa0..e387c671 100644
--- a/lib/SP/Services/Tag/TagService.php
+++ b/lib/SP/Services/Tag/TagService.php
@@ -38,7 +38,7 @@ use SP\Services\ServiceItemTrait;
  *
  * @package SP\Services\Tag
  */
-class TagService extends Service
+final class TagService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/Task/Task.php b/lib/SP/Services/Task/Task.php
index 608f1286..16800862 100644
--- a/lib/SP/Services/Task/Task.php
+++ b/lib/SP/Services/Task/Task.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,7 +33,7 @@ use SP\Util\Util;
  *
  * @package SP\Core
  */
-class Task
+final class Task
 {
     /**
      * @var string Nombre de la tarea
@@ -127,6 +127,7 @@ class Task
      * Generar un ID de tarea
      *
      * @param $name
+     *
      * @return string
      */
     public static function genTaskId($name)
@@ -164,6 +165,7 @@ class Task
      * Escribir el tado de la tarea a un archivo
      *
      * @param TaskMessage $Message
+     *
      * @return bool
      */
     public function writeStatus(TaskMessage $Message)
@@ -183,6 +185,7 @@ class Task
      * Escribir el tado de la tarea a un archivo
      *
      * @param TaskMessage $Message
+     *
      * @return bool
      */
     public function writeStatusAndFlush(TaskMessage $Message)
@@ -196,6 +199,7 @@ class Task
      * Escribir un mensaje en el archivo de la tarea en formato JSON
      *
      * @param TaskMessage $Message
+     *
      * @return bool
      */
     public function writeJsonStatusAndFlush(TaskMessage $Message)
@@ -209,6 +213,7 @@ class Task
      * Iniciar la tarea
      *
      * @param bool $startSession
+     *
      * @return bool
      */
     public function end($startSession = true)
@@ -256,6 +261,7 @@ class Task
 
     /**
      * @param int $interval
+     *
      * @return Task
      */
     public function setInterval($interval)
@@ -287,6 +293,7 @@ class Task
      * Es necesario bloquear la sesión para permitir la ejecución de otros scripts
      *
      * @param bool $lockSession Bloquear la sesión
+     *
      * @return Task
      */
     public function register($lockSession = true)
diff --git a/lib/SP/Services/Task/TaskFactory.php b/lib/SP/Services/Task/TaskFactory.php
index ef116294..e355a2ba 100644
--- a/lib/SP/Services/Task/TaskFactory.php
+++ b/lib/SP/Services/Task/TaskFactory.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Messages\TaskMessage;
  *
  * @package SP\Core
  */
-class TaskFactory
+final class TaskFactory
 {
     /**
      * @var Task[]
@@ -43,6 +43,7 @@ class TaskFactory
      *
      * @param string $name
      * @param string $id
+     *
      * @return Task
      */
     public static function create($name, $id)
@@ -52,6 +53,7 @@ class TaskFactory
 
     /**
      * @param Task $task
+     *
      * @return Task
      */
     private static function add(Task $task)
@@ -79,6 +81,7 @@ class TaskFactory
 
     /**
      * @param $id
+     *
      * @return Task
      */
     private static function get($id)
@@ -105,6 +108,7 @@ class TaskFactory
     /**
      * @param string $taskId
      * @param string $task
+     *
      * @return TaskMessage
      */
     public static function createMessage($taskId, $task)
diff --git a/lib/SP/Services/Task/TaskService.php b/lib/SP/Services/Task/TaskService.php
index 404be8bf..dbefc8d6 100644
--- a/lib/SP/Services/Task/TaskService.php
+++ b/lib/SP/Services/Task/TaskService.php
@@ -33,7 +33,7 @@ use SP\Util\Util;
  *
  * @package SP\Services
  */
-class TaskService extends Service
+final class TaskService extends Service
 {
     /**
      * Tiempo de espera en cada intento de inicialización
@@ -69,6 +69,7 @@ class TaskService extends Service
      * Realizar acción
      *
      * @param string $taskId
+     *
      * @throws ServiceException
      */
     public function run($taskId)
diff --git a/lib/SP/Services/Track/TrackService.php b/lib/SP/Services/Track/TrackService.php
index cf6b2493..2fcbfc13 100644
--- a/lib/SP/Services/Track/TrackService.php
+++ b/lib/SP/Services/Track/TrackService.php
@@ -38,7 +38,7 @@ use SP\Services\Service;
  *
  * @package SP\Services
  */
-class TrackService extends Service
+final class TrackService extends Service
 {
     /**
      * Tiempo para contador de intentos
diff --git a/lib/SP/Services/Upgrade/UpgradeAppService.php b/lib/SP/Services/Upgrade/UpgradeAppService.php
index f279d9f5..39286f55 100644
--- a/lib/SP/Services/Upgrade/UpgradeAppService.php
+++ b/lib/SP/Services/Upgrade/UpgradeAppService.php
@@ -35,12 +35,13 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeAppService extends Service implements UpgradeInterface
+final class UpgradeAppService extends Service implements UpgradeInterface
 {
     const UPGRADES = ['300.18010101'];
 
     /**
      * @param $version
+     *
      * @return bool
      */
     public static function needsUpgrade($version)
@@ -49,8 +50,9 @@ class UpgradeAppService extends Service implements UpgradeInterface
     }
 
     /**
-     * @param $version
+     * @param            $version
      * @param ConfigData $configData
+     *
      * @throws UpgradeException
      */
     public function upgrade($version, ConfigData $configData)
@@ -88,6 +90,7 @@ class UpgradeAppService extends Service implements UpgradeInterface
      * Actualizaciones de la aplicación
      *
      * @param $version
+     *
      * @return bool
      */
     private function applyUpgrade($version)
diff --git a/lib/SP/Services/Upgrade/UpgradeConfigService.php b/lib/SP/Services/Upgrade/UpgradeConfigService.php
index 0dd279eb..43c322d6 100644
--- a/lib/SP/Services/Upgrade/UpgradeConfigService.php
+++ b/lib/SP/Services/Upgrade/UpgradeConfigService.php
@@ -35,7 +35,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeConfigService extends Service implements UpgradeInterface
+final class UpgradeConfigService extends Service implements UpgradeInterface
 {
     /**
      * @var array Versiones actualizables
@@ -48,6 +48,7 @@ class UpgradeConfigService extends Service implements UpgradeInterface
 
     /**
      * @param $version
+     *
      * @return bool
      */
     public static function needsUpgrade($version)
@@ -59,6 +60,7 @@ class UpgradeConfigService extends Service implements UpgradeInterface
      * Actualizar el archivo de configuración a formato XML
      *
      * @param $version
+     *
      * @throws UpgradeException
      */
     public function upgradeOldConfigFile($version)
@@ -190,7 +192,7 @@ class UpgradeConfigService extends Service implements UpgradeInterface
     /**
      * Migrar valores de configuración.
      *
-     * @param $version
+     * @param            $version
      * @param ConfigData $configData
      */
     public function upgrade($version, ConfigData $configData)
diff --git a/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php b/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
index 96c75286..3f2eb0bc 100644
--- a/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
+++ b/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
@@ -30,7 +30,6 @@ use SP\DataModel\CustomFieldDefDataOld;
 use SP\DataModel\CustomFieldDefinitionData;
 use SP\Services\CustomField\CustomFieldDefService;
 use SP\Services\Service;
-use SP\Services\ServiceException;
 use SP\Storage\Database\Database;
 use SP\Storage\Database\QueryData;
 use SP\Util\Util;
@@ -40,7 +39,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeCustomFieldDefinition extends Service
+final class UpgradeCustomFieldDefinition extends Service
 {
     /**
      * @var \SP\Storage\Database\Database
@@ -49,8 +48,6 @@ class UpgradeCustomFieldDefinition extends Service
 
     /**
      * upgrade_300_18010101
-     *
-     * @throws \SP\Core\Exceptions\SPException
      */
     public function upgrade_300_18010101()
     {
@@ -60,44 +57,36 @@ class UpgradeCustomFieldDefinition extends Service
                 ->addDescription(__FUNCTION__))
         );
 
-        $customFieldDefService = $this->dic->get(CustomFieldDefService::class);
-
-        $queryData = new QueryData();
-        $queryData->setQuery('SELECT id, moduleId, field FROM CustomFieldDefinition WHERE field IS NOT NULL');
-
         try {
-            if (!$this->db->beginTransaction()) {
-                throw new ServiceException(__u('No es posible iniciar una transacción'));
-            }
+            $this->transactionAware(function () {
+                $customFieldDefService = $this->dic->get(CustomFieldDefService::class);
 
-            foreach ($this->db->doSelect($queryData)->getDataAsArray() as $item) {
-                /** @var CustomFieldDefDataOld $data */
-                $data = Util::unserialize(CustomFieldDefDataOld::class, $item->field, 'SP\DataModel\CustomFieldDefData');
+                $queryData = new QueryData();
+                $queryData->setQuery('SELECT id, moduleId, field FROM CustomFieldDefinition WHERE field IS NOT NULL');
 
-                $itemData = new CustomFieldDefinitionData();
-                $itemData->setId($item->id);
-                $itemData->setModuleId($item->moduleId);
-                $itemData->setName($data->getName());
-                $itemData->setHelp($data->getHelp());
-                $itemData->setRequired($data->isRequired());
-                $itemData->setShowInList($data->isShowInItemsList());
-                $itemData->setTypeId($data->getType());
+                foreach ($this->db->doSelect($queryData)->getDataAsArray() as $item) {
+                    /** @var CustomFieldDefDataOld $data */
+                    $data = Util::unserialize(CustomFieldDefDataOld::class, $item->field, 'SP\DataModel\CustomFieldDefData');
 
-                $customFieldDefService->update($itemData);
+                    $itemData = new CustomFieldDefinitionData();
+                    $itemData->setId($item->id);
+                    $itemData->setModuleId($item->moduleId);
+                    $itemData->setName($data->getName());
+                    $itemData->setHelp($data->getHelp());
+                    $itemData->setRequired($data->isRequired());
+                    $itemData->setShowInList($data->isShowInItemsList());
+                    $itemData->setTypeId($data->getType());
 
-                $this->eventDispatcher->notifyEvent('upgrade.customField.process',
-                    new Event($this, EventMessage::factory()
-                        ->addDescription(__u('Campo actualizado'))
-                        ->addDetail(__u('Campo'), $data->getName()))
-                );
-            }
+                    $customFieldDefService->update($itemData);
 
-            if (!$this->db->endTransaction()) {
-                throw new ServiceException(__u('No es posible finalizar una transacción'));
-            }
+                    $this->eventDispatcher->notifyEvent('upgrade.customField.process',
+                        new Event($this, EventMessage::factory()
+                            ->addDescription(__u('Campo actualizado'))
+                            ->addDetail(__u('Campo'), $data->getName()))
+                    );
+                }
+            });
         } catch (\Exception $e) {
-            $this->db->rollbackTransaction();
-
             processException($e);
 
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
diff --git a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
index 64f400a8..5f335479 100644
--- a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
+++ b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
@@ -31,8 +31,8 @@ use SP\Services\Service;
 use SP\Storage\Database\Database;
 use SP\Storage\Database\MySQLFileParser;
 use SP\Storage\Database\QueryData;
-use SP\Storage\FileException;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileHandler;
 use SP\Util\Util;
 
 /**
@@ -40,7 +40,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeDatabaseService extends Service implements UpgradeInterface
+final class UpgradeDatabaseService extends Service implements UpgradeInterface
 {
     /**
      * @var array Versiones actualizables
diff --git a/lib/SP/Services/Upgrade/UpgradeException.php b/lib/SP/Services/Upgrade/UpgradeException.php
index 410a9c02..31a17e24 100644
--- a/lib/SP/Services/Upgrade/UpgradeException.php
+++ b/lib/SP/Services/Upgrade/UpgradeException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeException extends SPException
+final class UpgradeException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Upgrade/UpgradeInterface.php b/lib/SP/Services/Upgrade/UpgradeInterface.php
index 3d37fd4c..e122c200 100644
--- a/lib/SP/Services/Upgrade/UpgradeInterface.php
+++ b/lib/SP/Services/Upgrade/UpgradeInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -23,6 +23,7 @@
  */
 
 namespace SP\Services\Upgrade;
+
 use SP\Config\ConfigData;
 
 /**
@@ -35,7 +36,7 @@ interface UpgradeInterface
     /**
      * Performs the upgrading process
      *
-     * @param $version
+     * @param            $version
      * @param ConfigData $configData
      */
     public function upgrade($version, ConfigData $configData);
@@ -44,6 +45,7 @@ interface UpgradeInterface
      * Check if it needs to be upgraded
      *
      * @param $version
+     *
      * @return bool
      */
     public static function needsUpgrade($version);
diff --git a/lib/SP/Services/Upgrade/UpgradePublicLink.php b/lib/SP/Services/Upgrade/UpgradePublicLink.php
index 0423de00..581f85f7 100644
--- a/lib/SP/Services/Upgrade/UpgradePublicLink.php
+++ b/lib/SP/Services/Upgrade/UpgradePublicLink.php
@@ -30,7 +30,6 @@ use SP\DataModel\PublickLinkOldData;
 use SP\DataModel\PublicLinkData;
 use SP\Services\PublicLink\PublicLinkService;
 use SP\Services\Service;
-use SP\Services\ServiceException;
 use SP\Storage\Database\Database;
 use SP\Storage\Database\QueryData;
 use SP\Util\Util;
@@ -40,7 +39,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradePublicLink extends Service
+final class UpgradePublicLink extends Service
 {
     /**
      * @var Database
@@ -58,49 +57,41 @@ class UpgradePublicLink extends Service
                 ->addDescription(__FUNCTION__))
         );
 
-        $queryData = new QueryData();
-        $queryData->setQuery('SELECT id, `data` FROM PublicLink');
-
         try {
-            $publicLinkService = $this->dic->get(PublicLinkService::class);
+            $this->transactionAware(function () {
+                $publicLinkService = $this->dic->get(PublicLinkService::class);
 
-            if (!$this->db->beginTransaction()) {
-                throw new ServiceException(__u('No es posible iniciar una transacción'));
-            }
+                $queryData = new QueryData();
+                $queryData->setQuery('SELECT id, `data` FROM PublicLink');
 
-            foreach ($this->db->doSelect($queryData)->getDataAsArray() as $item) {
-                /** @var PublickLinkOldData $data */
-                $data = Util::unserialize(PublickLinkOldData::class, $item->data, 'SP\DataModel\PublicLinkData');
+                foreach ($this->db->doSelect($queryData)->getDataAsArray() as $item) {
+                    /** @var PublickLinkOldData $data */
+                    $data = Util::unserialize(PublickLinkOldData::class, $item->data, 'SP\DataModel\PublicLinkData');
 
-                $itemData = new PublicLinkData();
-                $itemData->setId($item->id);
-                $itemData->setItemId($data->getItemId());
-                $itemData->setHash($data->getLinkHash());
-                $itemData->setUserId($data->getUserId());
-                $itemData->setTypeId($data->getTypeId());
-                $itemData->setNotify($data->isNotify());
-                $itemData->setDateAdd($data->getDateAdd());
-                $itemData->setDateExpire($data->getDateExpire());
-                $itemData->setCountViews($data->getCountViews());
-                $itemData->setMaxCountViews($data->getCountViews());
-                $itemData->setUseInfo($data->getUseInfo());
-                $itemData->setData($data->getData());
+                    $itemData = new PublicLinkData();
+                    $itemData->setId($item->id);
+                    $itemData->setItemId($data->getItemId());
+                    $itemData->setHash($data->getLinkHash());
+                    $itemData->setUserId($data->getUserId());
+                    $itemData->setTypeId($data->getTypeId());
+                    $itemData->setNotify($data->isNotify());
+                    $itemData->setDateAdd($data->getDateAdd());
+                    $itemData->setDateExpire($data->getDateExpire());
+                    $itemData->setCountViews($data->getCountViews());
+                    $itemData->setMaxCountViews($data->getCountViews());
+                    $itemData->setUseInfo($data->getUseInfo());
+                    $itemData->setData($data->getData());
 
-                $publicLinkService->update($itemData);
+                    $publicLinkService->update($itemData);
 
-                $this->eventDispatcher->notifyEvent('upgrade.publicLink.process',
-                    new Event($this, EventMessage::factory()
-                        ->addDescription(__u('Enlace actualizado'))
-                        ->addDetail(__u('Enlace'), $item->id))
-                );
-            }
-
-            if (!$this->db->endTransaction()) {
-                throw new ServiceException(__u('No es posible finalizar una transacción'));
-            }
+                    $this->eventDispatcher->notifyEvent('upgrade.publicLink.process',
+                        new Event($this, EventMessage::factory()
+                            ->addDescription(__u('Enlace actualizado'))
+                            ->addDetail(__u('Enlace'), $item->id))
+                    );
+                }
+            });
         } catch (\Exception $e) {
-            $this->db->rollbackTransaction();
-
             processException($e);
 
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
diff --git a/lib/SP/Services/Upgrade/UpgradeUtil.php b/lib/SP/Services/Upgrade/UpgradeUtil.php
index 71f734b7..6a1ca3a1 100644
--- a/lib/SP/Services/Upgrade/UpgradeUtil.php
+++ b/lib/SP/Services/Upgrade/UpgradeUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -23,6 +23,7 @@
  */
 
 namespace SP\Services\Upgrade;
+
 use SP\Config\Config;
 use SP\Util\Util;
 
@@ -31,12 +32,13 @@ use SP\Util\Util;
  *
  * @package SP\Services\Upgrade
  */
-class UpgradeUtil
+final class UpgradeUtil
 {
     /**
      * Normalizar un número de versión
      *
      * @param $version
+     *
      * @return string
      */
     public static function fixVersionNumber($version)
@@ -52,29 +54,6 @@ class UpgradeUtil
         return $version;
     }
 
-    /**
-     * Establecer la key de actualización
-     *
-     * @param Config $config
-     * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
-     */
-    public static function setUpgradeKey(Config $config)
-    {
-        $configData = $config->getConfigData();
-        $upgradeKey = $configData->getUpgradeKey();
-
-        if (empty($upgradeKey)) {
-            $configData->setUpgradeKey(Util::generateRandomBytes(32));
-        }
-
-        $configData->setMaintenance(true);
-        $config->saveConfig($configData, false);
-
-//        Init::initError(
-//            __('La aplicación necesita actualizarse'),
-//            sprintf(__('Si es un administrador pulse en el enlace: %s'), '<a href="index.php?a=upgrade&type=' . $type . '">' . __('Actualizar') . '</a>'));
-    }
-
     /**
      * Comrpueba y actualiza la versión de la BBDD.
      *
@@ -98,6 +77,30 @@ class UpgradeUtil
         }
     }
 
+    /**
+     * Establecer la key de actualización
+     *
+     * @param Config $config
+     *
+     * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
+     */
+    public static function setUpgradeKey(Config $config)
+    {
+        $configData = $config->getConfigData();
+        $upgradeKey = $configData->getUpgradeKey();
+
+        if (empty($upgradeKey)) {
+            $configData->setUpgradeKey(Util::generateRandomBytes(32));
+        }
+
+        $configData->setMaintenance(true);
+        $config->saveConfig($configData, false);
+
+//        Init::initError(
+//            __('La aplicación necesita actualizarse'),
+//            sprintf(__('Si es un administrador pulse en el enlace: %s'), '<a href="index.php?a=upgrade&type=' . $type . '">' . __('Actualizar') . '</a>'));
+    }
+
     /**
      * Comrpueba y actualiza la versión de la aplicación.
      *
diff --git a/lib/SP/Services/User/UpdatePassRequest.php b/lib/SP/Services/User/UpdatePassRequest.php
index bfd5bd6d..12cc4255 100644
--- a/lib/SP/Services/User/UpdatePassRequest.php
+++ b/lib/SP/Services/User/UpdatePassRequest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\User;
  *
  * @package SP\Services\User
  */
-class UpdatePassRequest
+final class UpdatePassRequest
 {
     /**
      * @var string
diff --git a/lib/SP/Services/User/UpdatedMasterPassException.php b/lib/SP/Services/User/UpdatedMasterPassException.php
index 3e2a6fa0..5168ec99 100644
--- a/lib/SP/Services/User/UpdatedMasterPassException.php
+++ b/lib/SP/Services/User/UpdatedMasterPassException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Services\User
  */
-class UpdatedMasterPassException extends SPException
+final class UpdatedMasterPassException extends SPException
 {
     /**
      * SPException constructor.
diff --git a/lib/SP/Services/User/UserLoginRequest.php b/lib/SP/Services/User/UserLoginRequest.php
index ea129053..4e5ec13e 100644
--- a/lib/SP/Services/User/UserLoginRequest.php
+++ b/lib/SP/Services/User/UserLoginRequest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\User;
  *
  * @package SP\Services\User
  */
-class UserLoginRequest
+final class UserLoginRequest
 {
     /**
      * @var string
diff --git a/lib/SP/Services/User/UserLoginResponse.php b/lib/SP/Services/User/UserLoginResponse.php
index b75a58d1..218dfbfe 100644
--- a/lib/SP/Services/User/UserLoginResponse.php
+++ b/lib/SP/Services/User/UserLoginResponse.php
@@ -31,7 +31,7 @@ use SP\DataModel\UserPreferencesData;
  *
  * @package SP\Services\User
  */
-class UserLoginResponse
+final class UserLoginResponse
 {
     /**
      * @var int
@@ -136,6 +136,7 @@ class UserLoginResponse
 
     /**
      * @param string $login
+     *
      * @return UserLoginResponse
      */
     public function setLogin($login)
@@ -154,6 +155,7 @@ class UserLoginResponse
 
     /**
      * @param string $ssoLogin
+     *
      * @return UserLoginResponse
      */
     public function setSsoLogin($ssoLogin)
@@ -172,6 +174,7 @@ class UserLoginResponse
 
     /**
      * @param string $name
+     *
      * @return UserLoginResponse
      */
     public function setName($name)
@@ -190,6 +193,7 @@ class UserLoginResponse
 
     /**
      * @param string $email
+     *
      * @return UserLoginResponse
      */
     public function setEmail($email)
@@ -208,6 +212,7 @@ class UserLoginResponse
 
     /**
      * @param int $userGroupId
+     *
      * @return UserLoginResponse
      */
     public function setUserGroupId($userGroupId)
@@ -226,6 +231,7 @@ class UserLoginResponse
 
     /**
      * @param int $userProfileId
+     *
      * @return UserLoginResponse
      */
     public function setUserProfileId($userProfileId)
@@ -244,6 +250,7 @@ class UserLoginResponse
 
     /**
      * @param int $isAdminApp
+     *
      * @return UserLoginResponse
      */
     public function setIsAdminApp($isAdminApp)
@@ -262,6 +269,7 @@ class UserLoginResponse
 
     /**
      * @param int $isAdminAcc
+     *
      * @return UserLoginResponse
      */
     public function setIsAdminAcc($isAdminAcc)
@@ -280,6 +288,7 @@ class UserLoginResponse
 
     /**
      * @param int $isDisabled
+     *
      * @return UserLoginResponse
      */
     public function setIsDisabled($isDisabled)
@@ -298,6 +307,7 @@ class UserLoginResponse
 
     /**
      * @param int $isChangePass
+     *
      * @return UserLoginResponse
      */
     public function setIsChangePass($isChangePass)
@@ -316,6 +326,7 @@ class UserLoginResponse
 
     /**
      * @param int $isChangedPass
+     *
      * @return UserLoginResponse
      */
     public function setIsChangedPass($isChangedPass)
@@ -334,6 +345,7 @@ class UserLoginResponse
 
     /**
      * @param int $isLdap
+     *
      * @return UserLoginResponse
      */
     public function setIsLdap($isLdap)
@@ -352,6 +364,7 @@ class UserLoginResponse
 
     /**
      * @param int $isMigrate
+     *
      * @return UserLoginResponse
      */
     public function setIsMigrate($isMigrate)
@@ -370,6 +383,7 @@ class UserLoginResponse
 
     /**
      * @param mixed $preferences
+     *
      * @return UserLoginResponse
      */
     public function setPreferences(UserPreferencesData $preferences)
@@ -388,6 +402,7 @@ class UserLoginResponse
 
     /**
      * @param string $pass
+     *
      * @return UserLoginResponse
      */
     public function setPass($pass)
@@ -406,6 +421,7 @@ class UserLoginResponse
 
     /**
      * @param string $mPass
+     *
      * @return UserLoginResponse
      */
     public function setMPass($mPass)
@@ -424,6 +440,7 @@ class UserLoginResponse
 
     /**
      * @param string $mKey
+     *
      * @return UserLoginResponse
      */
     public function setMKey($mKey)
@@ -442,6 +459,7 @@ class UserLoginResponse
 
     /**
      * @param int $lastUpdateMPass
+     *
      * @return UserLoginResponse
      */
     public function setLastUpdateMPass($lastUpdateMPass)
@@ -460,6 +478,7 @@ class UserLoginResponse
 
     /**
      * @param string $hashSalt
+     *
      * @return UserLoginResponse
      */
     public function setHashSalt($hashSalt)
@@ -478,6 +497,7 @@ class UserLoginResponse
 
     /**
      * @param int $id
+     *
      * @return UserLoginResponse
      */
     public function setId($id)
@@ -496,6 +516,7 @@ class UserLoginResponse
 
     /**
      * @param string $userGroupName
+     *
      * @return UserLoginResponse
      */
     public function setUserGroupName($userGroupName)
@@ -514,6 +535,7 @@ class UserLoginResponse
 
     /**
      * @param string $userProfileName
+     *
      * @return UserLoginResponse
      */
     public function setUserProfileName($userProfileName)
@@ -532,6 +554,7 @@ class UserLoginResponse
 
     /**
      * @param int $lastUpdate
+     *
      * @return UserLoginResponse
      */
     public function setLastUpdate(int $lastUpdate)
diff --git a/lib/SP/Services/User/UserPassResponse.php b/lib/SP/Services/User/UserPassResponse.php
index d3fa1ced..06d1144c 100644
--- a/lib/SP/Services/User/UserPassResponse.php
+++ b/lib/SP/Services/User/UserPassResponse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Services\User;
  *
  * @package SP\DataModel\Dto
  */
-class UserPassResponse
+final class UserPassResponse
 {
     /**
      * @var int
diff --git a/lib/SP/Services/User/UserPassService.php b/lib/SP/Services/User/UserPassService.php
index 775fd8c3..b7226df0 100644
--- a/lib/SP/Services/User/UserPassService.php
+++ b/lib/SP/Services/User/UserPassService.php
@@ -41,7 +41,7 @@ use SP\Services\Service;
  *
  * @package SP\Services\User
  */
-class UserPassService extends Service
+final class UserPassService extends Service
 {
     // La clave maestra incorrecta
     const MPASS_WRONG = 0;
diff --git a/lib/SP/Services/User/UserService.php b/lib/SP/Services/User/UserService.php
index 3ea3d091..5124884e 100644
--- a/lib/SP/Services/User/UserService.php
+++ b/lib/SP/Services/User/UserService.php
@@ -45,7 +45,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\User
  */
-class UserService extends Service
+final class UserService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Services/UserGroup/UserGroupService.php b/lib/SP/Services/UserGroup/UserGroupService.php
index 52356f48..670ae973 100644
--- a/lib/SP/Services/UserGroup/UserGroupService.php
+++ b/lib/SP/Services/UserGroup/UserGroupService.php
@@ -39,7 +39,7 @@ use SP\Services\ServiceItemTrait;
  *
  * @package SP\Services\UserGroup
  */
-class UserGroupService extends Service
+final class UserGroupService extends Service
 {
     use ServiceItemTrait;
 
@@ -123,7 +123,7 @@ class UserGroupService extends Service
      */
     public function create($itemData)
     {
-        return $this->transactionAware(function () use($itemData) {
+        return $this->transactionAware(function () use ($itemData) {
             $id = $this->userGroupRepository->create($itemData);
 
             if (count($itemData->getUsers()) > 0) {
diff --git a/lib/SP/Services/UserGroup/UserToUserGroupService.php b/lib/SP/Services/UserGroup/UserToUserGroupService.php
index b30a590f..831876f3 100644
--- a/lib/SP/Services/UserGroup/UserToUserGroupService.php
+++ b/lib/SP/Services/UserGroup/UserToUserGroupService.php
@@ -34,7 +34,7 @@ use SP\Services\Service;
  *
  * @package SP\Services\UserGroup
  */
-class UserToUserGroupService extends Service
+final class UserToUserGroupService extends Service
 {
     /**
      * @var UserToUserGroupRepository
diff --git a/lib/SP/Services/UserPassRecover/UserPassRecoverService.php b/lib/SP/Services/UserPassRecover/UserPassRecoverService.php
index cac3d680..3dd61a16 100644
--- a/lib/SP/Services/UserPassRecover/UserPassRecoverService.php
+++ b/lib/SP/Services/UserPassRecover/UserPassRecoverService.php
@@ -36,7 +36,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\UserPassRecover
  */
-class UserPassRecoverService extends Service
+final class UserPassRecoverService extends Service
 {
     /**
      * Tiempo máximo para recuperar la clave
diff --git a/lib/SP/Services/UserProfile/UserProfileService.php b/lib/SP/Services/UserProfile/UserProfileService.php
index 29d7f26f..28a6770b 100644
--- a/lib/SP/Services/UserProfile/UserProfileService.php
+++ b/lib/SP/Services/UserProfile/UserProfileService.php
@@ -40,7 +40,7 @@ use SP\Util\Util;
  *
  * @package SP\Services\UserProfile
  */
-class UserProfileService extends Service
+final class UserProfileService extends Service
 {
     use ServiceItemTrait;
 
diff --git a/lib/SP/Storage/Database/Database.php b/lib/SP/Storage/Database/Database.php
index a2b004ea..143486c3 100644
--- a/lib/SP/Storage/Database/Database.php
+++ b/lib/SP/Storage/Database/Database.php
@@ -38,7 +38,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Storage
  */
-class Database implements DatabaseInterface
+final class Database implements DatabaseInterface
 {
     /**
      * @var int Número de registros obtenidos
diff --git a/lib/SP/Storage/Database/DatabaseConnectionData.php b/lib/SP/Storage/Database/DatabaseConnectionData.php
index df818070..b6a4116f 100644
--- a/lib/SP/Storage/Database/DatabaseConnectionData.php
+++ b/lib/SP/Storage/Database/DatabaseConnectionData.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Config\ConfigData;
  *
  * @package SP\Storage
  */
-class DatabaseConnectionData
+final class DatabaseConnectionData
 {
     /**
      * @var string
@@ -60,6 +60,7 @@ class DatabaseConnectionData
 
     /**
      * @param ConfigData $configData
+     *
      * @return mixed
      */
     public static function getFromConfig(ConfigData $configData)
@@ -75,6 +76,7 @@ class DatabaseConnectionData
 
     /**
      * @param ConfigData $configData
+     *
      * @return DatabaseConnectionData
      */
     public function refreshFromConfig(ConfigData $configData)
@@ -99,6 +101,7 @@ class DatabaseConnectionData
 
     /**
      * @param string $dbHost
+     *
      * @return DatabaseConnectionData
      */
     public function setDbHost($dbHost)
@@ -117,6 +120,7 @@ class DatabaseConnectionData
 
     /**
      * @param string $dbSocket
+     *
      * @return DatabaseConnectionData
      */
     public function setDbSocket($dbSocket)
@@ -135,6 +139,7 @@ class DatabaseConnectionData
 
     /**
      * @param int $dbPort
+     *
      * @return DatabaseConnectionData
      */
     public function setDbPort($dbPort)
@@ -153,6 +158,7 @@ class DatabaseConnectionData
 
     /**
      * @param string $dbName
+     *
      * @return DatabaseConnectionData
      */
     public function setDbName($dbName)
@@ -171,6 +177,7 @@ class DatabaseConnectionData
 
     /**
      * @param string $dbUser
+     *
      * @return DatabaseConnectionData
      */
     public function setDbUser($dbUser)
@@ -189,6 +196,7 @@ class DatabaseConnectionData
 
     /**
      * @param string $dbPass
+     *
      * @return DatabaseConnectionData
      */
     public function setDbPass($dbPass)
diff --git a/lib/SP/Storage/Database/DatabaseException.php b/lib/SP/Storage/Database/DatabaseException.php
index a30d1677..5a10bd31 100644
--- a/lib/SP/Storage/Database/DatabaseException.php
+++ b/lib/SP/Storage/Database/DatabaseException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Storage\Database
  */
-class DatabaseException extends SPException
+final class DatabaseException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Storage/Database/DatabaseFileInterface.php b/lib/SP/Storage/Database/DatabaseFileInterface.php
index 6fac48db..728cbcc2 100644
--- a/lib/SP/Storage/Database/DatabaseFileInterface.php
+++ b/lib/SP/Storage/Database/DatabaseFileInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -23,10 +23,12 @@
  */
 
 namespace SP\Storage\Database;
-use SP\Storage\FileHandler;
+
+use SP\Storage\File\FileHandler;
 
 /**
  * Interface DatabaseFileInterface
+ *
  * @package SP\Storage
  */
 interface DatabaseFileInterface
@@ -35,7 +37,8 @@ interface DatabaseFileInterface
      * Parses a database script file and returns an array of lines parsed
      *
      * @param FileHandler $fileHandler
-     * @param string $delimiter
+     * @param string      $delimiter
+     *
      * @return array
      */
     public function parse(FileHandler $fileHandler, $delimiter = ';');
diff --git a/lib/SP/Storage/Database/DBUtil.php b/lib/SP/Storage/Database/DatabaseUtil.php
similarity index 99%
rename from lib/SP/Storage/Database/DBUtil.php
rename to lib/SP/Storage/Database/DatabaseUtil.php
index 015b4096..2e3b3147 100644
--- a/lib/SP/Storage/Database/DBUtil.php
+++ b/lib/SP/Storage/Database/DatabaseUtil.php
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Storage
  */
-class DBUtil
+final class DatabaseUtil
 {
     /**
      * @var array Tablas de la BBDD
diff --git a/lib/SP/Storage/Database/MySQLFileParser.php b/lib/SP/Storage/Database/MySQLFileParser.php
index bfd58ddc..f00a4a42 100644
--- a/lib/SP/Storage/Database/MySQLFileParser.php
+++ b/lib/SP/Storage/Database/MySQLFileParser.php
@@ -24,21 +24,21 @@
 
 namespace SP\Storage\Database;
 
-use SP\Storage\FileException;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileHandler;
 
 /**
  * Class MysqlFileParser
  *
  * @package SP\Storage
  */
-class MySQLFileParser implements DatabaseFileInterface
+final class MySQLFileParser implements DatabaseFileInterface
 {
     /**
      * Parses a database script file and returns an array of lines parsed
      *
-     * @param FileHandler $fileHandler
-     * @param string      $delimiter
+     * @param \SP\Storage\File\FileHandler $fileHandler
+     * @param string                       $delimiter
      *
      * @return array
      * @throws FileException
diff --git a/lib/SP/Storage/Database/MySQLHandler.php b/lib/SP/Storage/Database/MySQLHandler.php
index dae494a0..73e0d273 100644
--- a/lib/SP/Storage/Database/MySQLHandler.php
+++ b/lib/SP/Storage/Database/MySQLHandler.php
@@ -33,7 +33,7 @@ defined('APP_ROOT') || die();
  *
  * Esta clase se encarga de crear las conexiones a la BD
  */
-class MySQLHandler implements DBStorageInterface
+final class MySQLHandler implements DBStorageInterface
 {
     const STATUS_OK = 0;
     const STATUS_KO = 1;
diff --git a/lib/SP/Storage/Database/QueryData.php b/lib/SP/Storage/Database/QueryData.php
index 6627d813..e8cb14bd 100644
--- a/lib/SP/Storage/Database/QueryData.php
+++ b/lib/SP/Storage/Database/QueryData.php
@@ -31,7 +31,7 @@ use SP\DataModel\DataModelBase;
  *
  * @package SP\Storage
  */
-class QueryData
+final class QueryData
 {
     /**
      * @var array
diff --git a/lib/SP/Storage/Database/QueryResult.php b/lib/SP/Storage/Database/QueryResult.php
index 52b63ceb..cf66ec85 100644
--- a/lib/SP/Storage/Database/QueryResult.php
+++ b/lib/SP/Storage/Database/QueryResult.php
@@ -29,7 +29,7 @@ namespace SP\Storage\Database;
  *
  * @package SP\Storage\Database
  */
-class QueryResult
+final class QueryResult
 {
     /**
      * @var array
diff --git a/lib/SP/Storage/FileCache.php b/lib/SP/Storage/File/FileCache.php
similarity index 96%
rename from lib/SP/Storage/FileCache.php
rename to lib/SP/Storage/File/FileCache.php
index 1e2cfe69..e5715940 100644
--- a/lib/SP/Storage/FileCache.php
+++ b/lib/SP/Storage/File/FileCache.php
@@ -22,14 +22,14 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 /**
  * Class FileCache
  *
- * @package SP\Storage
+ * @package SP\Storage\File;
  */
-class FileCache implements FileStorageInterface
+final class FileCache implements FileStorageInterface
 {
     /**
      * @param string $path
@@ -53,6 +53,7 @@ class FileCache implements FileStorageInterface
     /**
      * @param string $path
      * @param mixed  $data
+     *
      * @return FileStorageInterface
      * @throws FileException
      */
@@ -99,6 +100,7 @@ class FileCache implements FileStorageInterface
      *
      * @param string $path
      * @param int    $time
+     *
      * @return mixed
      */
     public function isExpired($path, $time = 86400)
@@ -111,6 +113,7 @@ class FileCache implements FileStorageInterface
      *
      * @param string $path
      * @param int    $date
+     *
      * @return mixed
      */
     public function isExpiredDate($path, $date)
diff --git a/lib/SP/Storage/FileCachePacked.php b/lib/SP/Storage/File/FileCachePacked.php
similarity index 97%
rename from lib/SP/Storage/FileCachePacked.php
rename to lib/SP/Storage/File/FileCachePacked.php
index bfc10552..25c44666 100644
--- a/lib/SP/Storage/FileCachePacked.php
+++ b/lib/SP/Storage/File/FileCachePacked.php
@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 use RuntimeException;
 
 /**
  * Class FileCachePacked
  *
- * @package SP\Storage
+ * @package SP\Storage\File;
  */
-class FileCachePacked implements FileStorageInterface
+final class FileCachePacked implements FileStorageInterface
 {
     /**
      * @var array
diff --git a/lib/SP/Storage/FileException.php b/lib/SP/Storage/File/FileException.php
similarity index 83%
rename from lib/SP/Storage/FileException.php
rename to lib/SP/Storage/File/FileException.php
index af797a5b..d6ee42fd 100644
--- a/lib/SP/Storage/FileException.php
+++ b/lib/SP/Storage/File/FileException.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,15 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 use SP\Core\Exceptions\SPException;
 
 /**
  * Class FileException
- * @package SP\Storage
+ *
+ * @package SP\Storage\File;
  */
-class FileException extends SPException
+final class FileException extends SPException
 {
 
 }
\ No newline at end of file
diff --git a/lib/SP/Storage/FileHandler.php b/lib/SP/Storage/File/FileHandler.php
similarity index 98%
rename from lib/SP/Storage/FileHandler.php
rename to lib/SP/Storage/File/FileHandler.php
index dc9dbbb9..045822da 100644
--- a/lib/SP/Storage/FileHandler.php
+++ b/lib/SP/Storage/File/FileHandler.php
@@ -22,14 +22,14 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 /**
  * Class FileHandler
  *
- * @package SP\Storage
+ * @package SP\Storage\File;
  */
-class FileHandler
+final class FileHandler
 {
     const CHUNK_LENGTH = 8192;
     /**
diff --git a/lib/SP/Storage/FileStorageInterface.php b/lib/SP/Storage/File/FileStorageInterface.php
similarity index 88%
rename from lib/SP/Storage/FileStorageInterface.php
rename to lib/SP/Storage/File/FileStorageInterface.php
index 8f7f41a8..447493ab 100644
--- a/lib/SP/Storage/FileStorageInterface.php
+++ b/lib/SP/Storage/File/FileStorageInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,12 +22,12 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 /**
  * Interface FileStorageInterface
  *
- * @package SP\Storage
+ * @package SP\Storage\File;
  */
 interface FileStorageInterface
 {
@@ -41,7 +41,8 @@ interface FileStorageInterface
 
     /**
      * @param string $path
-     * @param mixed $data
+     * @param mixed  $data
+     *
      * @return FileStorageInterface
      * @throws FileException
      */
@@ -58,7 +59,8 @@ interface FileStorageInterface
      * Returns whether the file is expired
      *
      * @param string $path
-     * @param int $time
+     * @param int    $time
+     *
      * @return mixed
      */
     public function isExpired($path, $time = 86400);
diff --git a/lib/SP/Storage/XmlFileStorageInterface.php b/lib/SP/Storage/File/XmlFileStorageInterface.php
similarity index 97%
rename from lib/SP/Storage/XmlFileStorageInterface.php
rename to lib/SP/Storage/File/XmlFileStorageInterface.php
index ece4e2b8..464862e6 100644
--- a/lib/SP/Storage/XmlFileStorageInterface.php
+++ b/lib/SP/Storage/File/XmlFileStorageInterface.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 /**
  * Interface StorageInterface
@@ -42,6 +42,7 @@ interface XmlFileStorageInterface
     /**
      * @param mixed  $data Data to be saved
      * @param string $node
+     *
      * @return XmlFileStorageInterface
      */
     public function save($data, $node = '');
diff --git a/lib/SP/Storage/XmlHandler.php b/lib/SP/Storage/File/XmlHandler.php
similarity index 97%
rename from lib/SP/Storage/XmlHandler.php
rename to lib/SP/Storage/File/XmlHandler.php
index 409fcb16..b1ac086d 100644
--- a/lib/SP/Storage/XmlHandler.php
+++ b/lib/SP/Storage/File/XmlHandler.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Storage;
+namespace SP\Storage\File;
 
 use DOMDocument;
 use DOMElement;
@@ -34,9 +34,9 @@ use RuntimeException;
 /**
  * Class XmlHandler para manejo básico de documentos XML
  *
- * @package SMD\Storage
+ * @package SP\Storage\File;
  */
-class XmlHandler implements XmlFileStorageInterface
+final class XmlHandler implements XmlFileStorageInterface
 {
     /**
      * @var mixed
@@ -69,6 +69,7 @@ class XmlHandler implements XmlFileStorageInterface
      * Cargar un archivo XML
      *
      * @param string $node
+     *
      * @return XmlFileStorageInterface
      * @throws FileException
      * @throws RuntimeException
@@ -105,6 +106,7 @@ class XmlHandler implements XmlFileStorageInterface
      * Leer de forma recursiva los nodos hijos y devolver un array multidimensional
      *
      * @param DOMNodeList $nodeList
+     *
      * @return array
      */
     protected function readChildNodes(DOMNodeList $nodeList)
@@ -139,6 +141,7 @@ class XmlHandler implements XmlFileStorageInterface
      * Obtener un elemento del array
      *
      * @param $id
+     *
      * @return mixed
      */
     public function __get($id)
@@ -151,6 +154,7 @@ class XmlHandler implements XmlFileStorageInterface
      *
      * @param mixed  $data Data to be saved
      * @param string $node
+     *
      * @return XmlFileStorageInterface
      * @throws FileException
      * @throws RuntimeException
@@ -211,6 +215,7 @@ class XmlHandler implements XmlFileStorageInterface
      *
      * @param mixed $items
      * @param bool  $serialize
+     *
      * @return array
      */
     protected function analyzeItems($items, $serialize = false)
@@ -233,6 +238,7 @@ class XmlHandler implements XmlFileStorageInterface
      * Analizar un elemento del tipo objeto
      *
      * @param $object
+     *
      * @return array
      */
     protected function analyzeObject($object)
@@ -274,6 +280,7 @@ class XmlHandler implements XmlFileStorageInterface
      * Establecer los elementos
      *
      * @param $items
+     *
      * @return XmlHandler
      */
     public function setItems($items)
diff --git a/lib/SP/Util/ArrayUtil.php b/lib/SP/Util/ArrayUtil.php
index e56346d9..ec367080 100644
--- a/lib/SP/Util/ArrayUtil.php
+++ b/lib/SP/Util/ArrayUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,15 +29,16 @@ namespace SP\Util;
  *
  * @package SP\Util
  */
-class ArrayUtil
+final class ArrayUtil
 {
     /**
      * Buscar un objeto en un array según el valor de una propiedad
      *
-     * @param array $array
+     * @param array  $array
      * @param string $property Nombre de la propiedad
-     * @param string $value Valor de la propiedad
-     * @param object $default Valor por defecto
+     * @param string $value    Valor de la propiedad
+     * @param object $default  Valor por defecto
+     *
      * @return false|object
      */
     public static function searchInObject(array $array, $property, $value, $default = null)
@@ -57,9 +58,10 @@ class ArrayUtil
     /**
      * Comprobar si un valor existe en un array de objetos
      *
-     * @param array $objectArray
+     * @param array  $objectArray
      * @param string $method
-     * @param mixed $value
+     * @param mixed  $value
+     *
      * @return bool
      */
     public static function checkInObjectArrayMethod(array $objectArray, $method, $value)
@@ -76,9 +78,10 @@ class ArrayUtil
     /**
      * Comprobar si un valor existe en un array de objetos
      *
-     * @param array $objectArray
+     * @param array  $objectArray
      * @param string $property
-     * @param mixed $value
+     * @param mixed  $value
+     *
      * @return bool
      */
     public static function checkInObjectArray(array $objectArray, $property, $value)
diff --git a/lib/SP/Util/Checks.php b/lib/SP/Util/Checks.php
index 959910e3..8f49c44b 100644
--- a/lib/SP/Util/Checks.php
+++ b/lib/SP/Util/Checks.php
@@ -29,7 +29,7 @@ namespace SP\Util;
  *
  * @package SP\Util
  */
-class Checks
+final class Checks
 {
     /**
      * Comprobar si la función de números aleatorios está disponible.
diff --git a/lib/SP/Util/Connection.php b/lib/SP/Util/Connection.php
index 818e3efe..82da7217 100644
--- a/lib/SP/Util/Connection.php
+++ b/lib/SP/Util/Connection.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
  *
  * @package SP\Util
  */
-class Connection implements ConnectionInterface
+final class Connection implements ConnectionInterface
 {
     /**
      * @var resource
@@ -74,12 +74,13 @@ class Connection implements ConnectionInterface
      * Obtener un socket
      *
      * @param $type int EL tipo de socket TCP/UDP
+     *
      * @return resource
      * @throws \SP\Core\Exceptions\SPException
      */
     public function getSocket($type)
     {
-        switch ($type){
+        switch ($type) {
             case self::TYPE_TCP:
                 $this->socket = $this->getTCPSocket();
                 break;
@@ -113,6 +114,7 @@ class Connection implements ConnectionInterface
      * Enviar un mensaje al socket
      *
      * @param $message string El mensaje a enviar
+     *
      * @return int|bool
      * @throws \SP\Core\Exceptions\SPException
      */
diff --git a/lib/SP/Util/ConnectionInterface.php b/lib/SP/Util/ConnectionInterface.php
index c2243a40..054cf33a 100644
--- a/lib/SP/Util/ConnectionInterface.php
+++ b/lib/SP/Util/ConnectionInterface.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -39,6 +39,7 @@ interface ConnectionInterface
      * Obtener un socket
      *
      * @param $type
+     *
      * @return resource
      */
     public function getSocket($type);
@@ -61,6 +62,7 @@ interface ConnectionInterface
      * Enviar un mensaje al socket
      *
      * @param $message string El mensaje a enviar
+     *
      * @return mixed
      */
     public function send($message);
diff --git a/lib/SP/Util/DateUtil.php b/lib/SP/Util/DateUtil.php
index 22bdb30e..a8b22859 100644
--- a/lib/SP/Util/DateUtil.php
+++ b/lib/SP/Util/DateUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -29,13 +29,14 @@ namespace SP\Util;
  *
  * @package SP\Util
  */
-class DateUtil
+final class DateUtil
 {
     /**
      * Returns date string from UNIX timestamp
      *
      * @param        $date
      * @param string $format
+     *
      * @return false|string
      */
     public static function getDateFromUnix($date, $format = 'Y-m-d H:i')
diff --git a/lib/SP/Util/ErrorUtil.php b/lib/SP/Util/ErrorUtil.php
index 2543cd99..233d94c9 100644
--- a/lib/SP/Util/ErrorUtil.php
+++ b/lib/SP/Util/ErrorUtil.php
@@ -36,7 +36,7 @@ use SP\Services\User\UpdatedMasterPassException;
  *
  * @package SP\Util
  */
-class ErrorUtil
+final class ErrorUtil
 {
     /**
      * Constantes de errores
@@ -118,6 +118,7 @@ class ErrorUtil
      * Return error message by type
      *
      * @param $type
+     *
      * @return mixed
      */
     protected static function getErrorTypes($type)
diff --git a/lib/SP/Util/FileUtil.php b/lib/SP/Util/FileUtil.php
index fb199ec1..77e4922b 100644
--- a/lib/SP/Util/FileUtil.php
+++ b/lib/SP/Util/FileUtil.php
@@ -35,7 +35,7 @@ use SP\DataModel\FileData;
  *
  * @package SP\Util
  */
-class FileUtil
+final class FileUtil
 {
     /**
      * @var array
diff --git a/lib/SP/Util/Filter.php b/lib/SP/Util/Filter.php
index bb3dc8a4..5cb6a3cc 100644
--- a/lib/SP/Util/Filter.php
+++ b/lib/SP/Util/Filter.php
@@ -31,7 +31,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP\Util
  */
-class Filter
+final class Filter
 {
     /**
      * Limpiar una cadena de búsqueda de carácteres utilizados en expresiones regulares
diff --git a/lib/SP/Util/HttpUtil.php b/lib/SP/Util/HttpUtil.php
index 8074f6e5..d459d18e 100644
--- a/lib/SP/Util/HttpUtil.php
+++ b/lib/SP/Util/HttpUtil.php
@@ -33,7 +33,7 @@ use SP\Http\Request;
  *
  * @package SP\Util
  */
-class HttpUtil
+final class HttpUtil
 {
     /**
      * Comprobar y forzar (si es necesario) la conexión HTTPS
diff --git a/lib/SP/Util/ImageUtil.php b/lib/SP/Util/ImageUtil.php
index 7ea50878..bec25fea 100644
--- a/lib/SP/Util/ImageUtil.php
+++ b/lib/SP/Util/ImageUtil.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -25,7 +25,6 @@
 namespace SP\Util;
 
 use SP\Core\Exceptions\InvalidImageException;
-use SP\Log\LogUtil;
 
 defined('APP_ROOT') || die();
 
@@ -34,7 +33,7 @@ defined('APP_ROOT') || die();
  *
  * @package SP
  */
-class ImageUtil
+final class ImageUtil
 {
     /**
      * Convertir un texto a imagen
diff --git a/lib/SP/Util/Json.php b/lib/SP/Util/Json.php
index be420fef..00448602 100644
--- a/lib/SP/Util/Json.php
+++ b/lib/SP/Util/Json.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -33,12 +33,13 @@ use SP\Http\JsonResponse;
  *
  * @package SP\Util
  */
-class Json
+final class Json
 {
     /**
      * Devuelve una respuesta en formato JSON con el estado y el mensaje.
      *
      * @param JsonResponse $JsonResponse
+     *
      * @return void
      */
     public static function returnJson(JsonResponse $JsonResponse)
@@ -56,22 +57,11 @@ class Json
         }
     }
 
-    /**
-     * Devuelve una respuesta en formato JSON
-     *
-     * @param string $data JSON string
-     */
-    public static function returnRawJson($data)
-    {
-        header('Content-type: application/json; charset=utf-8');
-
-        exit($data);
-    }
-
     /**
      * Devuelve una cadena en formato JSON
      *
      * @param $data
+     *
      * @return string La cadena en formato JSON
      * @throws \SP\Core\Exceptions\SPException
      */
@@ -86,10 +76,23 @@ class Json
         return $json;
     }
 
+    /**
+     * Devuelve una respuesta en formato JSON
+     *
+     * @param string $data JSON string
+     */
+    public static function returnRawJson($data)
+    {
+        header('Content-type: application/json; charset=utf-8');
+
+        exit($data);
+    }
+
     /**
      * Devuelve un array con las cadenas formateadas para JSON
      *
      * @param $data mixed
+     *
      * @return mixed
      */
     public static function safeJson(&$data)
@@ -125,6 +128,7 @@ class Json
      * Devuelve una cadena con los carácteres formateadas para JSON
      *
      * @param $string
+     *
      * @return mixed
      */
     public static function safeJsonString(&$string)
diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php
index 4a0369cf..33421cb1 100644
--- a/lib/SP/Util/Util.php
+++ b/lib/SP/Util/Util.php
@@ -30,8 +30,6 @@ use SP\Bootstrap;
 use SP\Config\ConfigData;
 use SP\Core\Exceptions\SPException;
 use SP\Html\Html;
-use SP\Log\Log;
-use SP\Log\LogUtil;
 use SP\Services\Install\Installer;
 
 defined('APP_ROOT') || die();
@@ -39,7 +37,7 @@ defined('APP_ROOT') || die();
 /**
  * Clase con utilizades para la aplicación
  */
-class Util
+final class Util
 {
     /**
      * Generar una clave aleatoria
@@ -170,6 +168,8 @@ class Util
      * @throws \Psr\Container\NotFoundExceptionInterface
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws SPException
+     *
+     * @todo Use Guzzle
      */
     public static function getDataFromUrl($url, array $data = null, $useCookie = false, $weak = false)
     {
diff --git a/lib/SP/Util/Wiki/DokuWikiApi.php b/lib/SP/Util/Wiki/DokuWikiApi.php
index 14ed5bec..1cbbd947 100644
--- a/lib/SP/Util/Wiki/DokuWikiApi.php
+++ b/lib/SP/Util/Wiki/DokuWikiApi.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -46,9 +46,10 @@ class DokuWikiApi extends DokuWikiApiBase
     /**
      * Constructor
      *
-     * @param string $url La URL de conexión
+     * @param string $url  La URL de conexión
      * @param string $user El usuario de conexión
      * @param string $pass La clave de conexión
+     *
      * @throws \SP\Core\Exceptions\SPException
      */
     public function __construct($url = null, $user = null, $pass = null)
@@ -79,13 +80,14 @@ class DokuWikiApi extends DokuWikiApiBase
             throw new SPException($e->getMessage(), SPException::WARNING);
         }
     }
-    
+
     /**
      * Comprobar la conexión a DokuWiki
      *
-     * @param string $url La URL de conexión
+     * @param string $url  La URL de conexión
      * @param string $user El usuario de conexión
      * @param string $pass La clave de conexión
+     *
      * @return DokuWikiApi
      * @throws \SP\Core\Exceptions\SPException
      */
@@ -126,6 +128,7 @@ class DokuWikiApi extends DokuWikiApiBase
      * Realizar una búsqueda en la Wiki
      *
      * @param string $search El texto a buscar
+     *
      * @return array|bool
      */
     public function getSearch($search)
@@ -147,6 +150,7 @@ class DokuWikiApi extends DokuWikiApiBase
      * Obtener una página de la Wiki
      *
      * @param string $page El nombre de la página a obtener
+     *
      * @return array|bool
      */
     public function getPage($page)
@@ -172,6 +176,7 @@ class DokuWikiApi extends DokuWikiApiBase
      * Obtener una página de la Wiki en formato original
      *
      * @param string $page El nombre de la página a obtener
+     *
      * @return array|bool
      */
     public function getRawPage($page)
@@ -193,6 +198,7 @@ class DokuWikiApi extends DokuWikiApiBase
      * Obtener la información de una página de la Wiki
      *
      * @param string $page El nombre de la página a obtener
+     *
      * @return array|bool
      */
     public function getPageInfo($page)
@@ -256,6 +262,7 @@ class DokuWikiApi extends DokuWikiApiBase
      * Obtener los permisos de la página
      *
      * @param $page
+     *
      * @return array|bool
      */
     public function getAcl($page)
diff --git a/lib/SP/Util/Wiki/DokuWikiApiBase.php b/lib/SP/Util/Wiki/DokuWikiApiBase.php
index 9cf12ce9..622aea53 100644
--- a/lib/SP/Util/Wiki/DokuWikiApiBase.php
+++ b/lib/SP/Util/Wiki/DokuWikiApiBase.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -114,6 +114,7 @@ abstract class DokuWikiApiBase
      * Crear la llamada al método de DokuWiki
      *
      * @param $function
+     *
      * @throws SPException
      */
     protected function createMsg($function)
@@ -138,6 +139,7 @@ abstract class DokuWikiApiBase
      * Añadir un parámetro
      *
      * @param $value
+     *
      * @throws \SP\Core\Exceptions\SPException
      */
     protected function addParam($value)
@@ -180,6 +182,7 @@ abstract class DokuWikiApiBase
      * Capturar si han habido errores en la consulta XML
      *
      * @param XMLRPCResponseParse $Res
+     *
      * @throws SPException
      */
     protected function catchError(XMLRPCResponseParse $Res)
@@ -210,6 +213,7 @@ abstract class DokuWikiApiBase
      * @param string $url  La URL de conexión
      * @param string $user El usuario de conexión
      * @param string $pass La clave de conexión
+     *
      * @throws SPException
      */
     protected function setConnectionData($url, $user, $pass)
diff --git a/lib/SP/Util/Wiki/DokuWikiApiParse.php b/lib/SP/Util/Wiki/DokuWikiApiParse.php
index 21f62028..2687bafd 100644
--- a/lib/SP/Util/Wiki/DokuWikiApiParse.php
+++ b/lib/SP/Util/Wiki/DokuWikiApiParse.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
diff --git a/test/SP/Repositories/AccountRepositoryTest.php b/test/SP/Repositories/AccountRepositoryTest.php
index 1ce73331..9f11c5f6 100644
--- a/test/SP/Repositories/AccountRepositoryTest.php
+++ b/test/SP/Repositories/AccountRepositoryTest.php
@@ -25,17 +25,18 @@
 namespace SP\Test\Repositories;
 
 use DI\DependencyException;
-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
 use SP\Core\Crypt\Crypt;
+use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\AccountData;
+use SP\DataModel\AccountSearchVData;
 use SP\DataModel\AccountVData;
-use SP\DataModel\Dto\AccountSearchResponse;
 use SP\DataModel\ItemSearchData;
 use SP\Mvc\Model\QueryCondition;
 use SP\Repositories\Account\AccountRepository;
 use SP\Services\Account\AccountPasswordRequest;
+use SP\Services\Account\AccountRequest;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Test\DatabaseTestCase;
 use function SP\Test\setupContext;
@@ -96,11 +97,27 @@ class AccountRepositoryTest extends DatabaseTestCase
     }
 
     /**
-     * No implementado
+     * @throws ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
      */
     public function testEditRestore()
     {
-        $this->markTestIncomplete();
+        $this->assertTrue(self::$repository->editRestore(3, 1));
+
+        $this->assertEquals(5, $this->conn->getRowCount('AccountHistory'));
+
+        $this->assertEquals(0, self::$repository->editRestore(1, 1));
+    }
+
+    /**
+     * @throws ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
+     */
+    public function testEditRestoreUnknownUser()
+    {
+        $this->expectException(ConstraintException::class);
+
+        self::$repository->editRestore(3, 10);
     }
 
     /**
@@ -122,14 +139,14 @@ class AccountRepositoryTest extends DatabaseTestCase
         // Comprobar que la modificación de la clave es correcta
         $this->assertEquals(1, self::$repository->editPassword($accountRequest));
 
-        $accountPassData = self::$repository->getPasswordForId(2)->getData();
+        $accountPassData = self::$repository->getPasswordForId(2, new QueryCondition())->getData();
         $clearPassword = Crypt::decrypt($accountPassData->pass, $accountPassData->key, self::SECURE_KEY_PASSWORD);
 
         // Comprobar que la clave obtenida es igual a la encriptada anteriormente
         $this->assertEquals('1234', $clearPassword);
 
         // Comprobar que no devuelve resultados
-        $this->assertEquals(0, self::$repository->getPasswordForId(10)->getNumRows());
+        $this->assertEquals(0, self::$repository->getPasswordForId(10, new QueryCondition())->getNumRows());
     }
 
     /**
@@ -200,11 +217,11 @@ class AccountRepositoryTest extends DatabaseTestCase
     }
 
     /**
-     * No implementado
+     * Not implemented
      */
     public function testCheckDuplicatedOnAdd()
     {
-        $this->markTestIncomplete();
+        $this->markTestSkipped('Not implemented');
     }
 
     /**
@@ -332,7 +349,7 @@ class AccountRepositoryTest extends DatabaseTestCase
         // Comprobar que la modificación de la clave es correcta
         $this->assertTrue(self::$repository->updatePassword($accountRequest));
 
-        $accountPassData = self::$repository->getPasswordForId(2)->getData();
+        $accountPassData = self::$repository->getPasswordForId(2, new QueryCondition())->getData();
         $clearPassword = Crypt::decrypt($accountPassData->pass, $accountPassData->key, self::SECURE_KEY_PASSWORD);
 
         // Comprobar que la clave obtenida es igual a la encriptada anteriormente
@@ -458,27 +475,49 @@ class AccountRepositoryTest extends DatabaseTestCase
     }
 
     /**
-     * No implementado
+     * Not implemented
      */
     public function testGetByIdBatch()
     {
-        $this->markTestIncomplete();
+        $this->markTestSkipped('Not implemented');
     }
 
     /**
-     * No implementado
+     * Not implemented
      */
     public function testCheckDuplicatedOnUpdate()
     {
-        $this->markTestIncomplete();
+        $this->markTestSkipped('Not implemented');
     }
 
     /**
-     * No implementado
+     * @throws ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
      */
     public function testGetPasswordHistoryForId()
     {
-        $this->markTestIncomplete();
+        $condition = new QueryCondition();
+        $condition->addFilter('AccountHistory.id = 3');
+
+        $result = self::$repository->getPasswordHistoryForId($condition);
+
+        $this->assertEquals(1, $result->getNumRows());
+
+        $data = $result->getData();
+
+        $this->assertEquals(3, $data->getId());
+        $this->assertEquals('Google', $data->getName());
+        $this->assertEquals('admin', $data->getLogin());
+        $this->assertNull($data->getParentId());
+        $this->assertEquals(pack('H*', '646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838'), $data->getPass());
+        $this->assertEquals(pack('H*', '6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234'), $data->getKey());
+        $this->assertEquals(pack('H*', '24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961'), $data->getMPassHash());
+
+
+        $condition = new QueryCondition();
+        $condition->addFilter('AccountHistory.id = 1');
+
+        $this->assertEquals(0, self::$repository->getPasswordHistoryForId($condition)->getNumRows());
     }
 
     /**
@@ -495,78 +534,72 @@ class AccountRepositoryTest extends DatabaseTestCase
         $searchFilter->setCategoryId(1);
 
         // Comprobar un Id de categoría
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
+        $this->assertEquals(1, $response->getNumRows());
 
         // Comprobar un Id de categoría no existente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setCategoryId(10);
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertEquals(0, $response->getNumRows());
 
         // Comprobar un Id de cliente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId(1);
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
+        $this->assertEquals(1, $response->getNumRows());
 
         // Comprobar un Id de cliente no existente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId(10);
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertEquals(0, $response->getNumRows());
 
         // Comprobar una cadena de texto
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setCleanTxtSearch('apple.com');
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
-        $this->assertEquals(2, $response->getData()[0]->getId());
+        $this->assertEquals(1, $response->getNumRows());
+
+        /** @var AccountSearchVData[] $data */
+        $data = $response->getDataAsArray();
+
+        $this->assertEquals(2, $data[0]->getId());
 
         // Comprobar los favoritos
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setSearchFavorites(true);
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertEquals(0, $response->getNumRows());
 
         // Comprobar las etiquetas
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setTagsId([1]);
 
-        $response = self::$repository->getByFilter($searchFilter);
+        $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
-        $this->assertEquals(1, $response->getData()[0]->getId());
+        $this->assertEquals(1, $response->getNumRows());
+
+        /** @var AccountSearchVData[] $data */
+        $data = $response->getDataAsArray();
+
+        $this->assertEquals(1, $data[0]->getId());
     }
 }
diff --git a/test/SP/Repositories/AccountToTagRepositoryTest.php b/test/SP/Repositories/AccountToTagRepositoryTest.php
index 46b38ece..f8aa9d3d 100644
--- a/test/SP/Repositories/AccountToTagRepositoryTest.php
+++ b/test/SP/Repositories/AccountToTagRepositoryTest.php
@@ -25,10 +25,10 @@
 namespace SP\Test\Repositories;
 
 use DI\DependencyException;
-use SP\Account\AccountRequest;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToTagRepository;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Test\DatabaseTestCase;
 use function SP\Test\setupContext;
diff --git a/test/SP/Repositories/AccountToUserGroupRepositoryTest.php b/test/SP/Repositories/AccountToUserGroupRepositoryTest.php
index 1a5490ef..4fdab26c 100644
--- a/test/SP/Repositories/AccountToUserGroupRepositoryTest.php
+++ b/test/SP/Repositories/AccountToUserGroupRepositoryTest.php
@@ -25,10 +25,10 @@
 namespace SP\Test\Repositories;
 
 use DI\DependencyException;
-use SP\Account\AccountRequest;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserGroupRepository;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Test\DatabaseTestCase;
 use function SP\Test\setupContext;
@@ -252,7 +252,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(3, self::$repository->add($accountRequest));
 
-        $result  = self::$repository->getUserGroupsByAccountId($accountRequest->id);
+        $result = self::$repository->getUserGroupsByAccountId($accountRequest->id);
 
         $this->assertEquals(3, $result->getNumRows());
 
diff --git a/test/SP/Repositories/AccountToUserRepositoryTest.php b/test/SP/Repositories/AccountToUserRepositoryTest.php
index e0f37c9f..45982f3b 100644
--- a/test/SP/Repositories/AccountToUserRepositoryTest.php
+++ b/test/SP/Repositories/AccountToUserRepositoryTest.php
@@ -25,10 +25,10 @@
 namespace SP\Test\Repositories;
 
 use DI\DependencyException;
-use SP\Account\AccountRequest;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserRepository;
+use SP\Services\Account\AccountRequest;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Test\DatabaseTestCase;
 use function SP\Test\setupContext;
diff --git a/test/SP/Repositories/CustomFieldTypeRepositoryTest.php b/test/SP/Repositories/CustomFieldTypeRepositoryTest.php
index 769695d5..6e259f62 100644
--- a/test/SP/Repositories/CustomFieldTypeRepositoryTest.php
+++ b/test/SP/Repositories/CustomFieldTypeRepositoryTest.php
@@ -27,7 +27,6 @@ namespace SP\Test\Repositories;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CustomFieldTypeData;
 use SP\Repositories\CustomField\CustomFieldTypeRepository;
-use SP\Repositories\NoSuchItemException;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Test\DatabaseTestCase;
 use function SP\Test\setupContext;
@@ -105,17 +104,21 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertCount(10, $result);
-        $this->assertInstanceOf(CustomFieldTypeData::class, $result[0]);
-        $this->assertEquals(1, $result[0]->getId());
-        $this->assertEquals('text', $result[0]->getName());
-        $this->assertEquals('Texto', $result[0]->getText());
+        $this->assertEquals(10, $result->getNumRows());
+
+        /** @var CustomFieldTypeData[] $data */
+        $data = $result->getDataAsArray();
+
+        $this->assertCount(10, $data);
+        $this->assertInstanceOf(CustomFieldTypeData::class, $data[0]);
+        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals('text', $data[0]->getName());
+        $this->assertEquals('Texto', $data[0]->getText());
     }
 
     /**
      * @throws ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
-     * @throws \SP\Repositories\NoSuchItemException
      */
     public function testGetById()
     {
@@ -124,11 +127,13 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
         $data->setName('textarea');
         $data->setText('Área de Texto');
 
-        $this->assertEquals($data, self::$repository->getById(10));
+        $result = self::$repository->getById(10);
 
-        $this->expectException(NoSuchItemException::class);
+        $this->assertEquals(1, $result->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getById(11));
+        $this->assertEquals($data, $result->getData());
+
+        $this->assertEquals(0, self::$repository->getById(11)->getNumRows());
     }
 
     /**
@@ -144,7 +149,8 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
         $data->setText('Prueba');
 
         $this->assertEquals(11, self::$repository->create($data));
-        $this->assertEquals($data, self::$repository->getById(11));
+
+        $this->assertEquals($data, self::$repository->getById(11)->getData());
     }
 
     /**
@@ -160,6 +166,7 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
         $data->setText('Prueba');
 
         $this->assertEquals(1, self::$repository->update($data));
-        $this->assertEquals($data, self::$repository->getById(10));
+
+        $this->assertEquals($data, self::$repository->getById(10)->getData());
     }
 }
diff --git a/test/SP/Services/Account/AccountAclServiceTest.php b/test/SP/Services/Account/AccountAclServiceTest.php
index 881e1e9e..5a894b28 100644
--- a/test/SP/Services/Account/AccountAclServiceTest.php
+++ b/test/SP/Services/Account/AccountAclServiceTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -24,12 +24,12 @@
 
 namespace SP\Test\Services\Account;
 
-use SP\Account\AccountAcl;
 use SP\Core\Acl\Acl;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Context\StatelessContext;
 use SP\DataModel\Dto\AccountAclDto;
 use SP\DataModel\Dto\AccountDetailsResponse;
+use SP\Services\Account\AccountAcl;
 use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountService;
 use SP\Services\User\UserLoginResponse;
@@ -156,6 +156,7 @@ class AccountAclServiceTest extends DatabaseTestCase
         $service->saveAclInCache($accountAcl);
 
         $this->assertTrue(AccountAclService::clearAcl(1));
+
         $this->assertFalse(AccountAclService::clearAcl(2));
     }
 
@@ -169,7 +170,7 @@ class AccountAclServiceTest extends DatabaseTestCase
         $this->checkAllowAll($this->setUpAccountEnvironment(1, 1, 1, 1));
         $this->checkAllowAll($this->setUpAccountEnvironment(2, 1, 1, 1));
 
-        $accountAcl = new AccountAcl(0);
+        $accountAcl = new \SP\Services\Account\AccountAcl(0);
         $accountAcl->setCompiledAccountAccess(true);
         $accountAcl->setCompiledShowAccess(true);
         $accountAcl->setResultView(true);
@@ -257,7 +258,7 @@ class AccountAclServiceTest extends DatabaseTestCase
 
             $accountAcl = $service->getAcl($action, $accountAclDto);
 
-            $this->assertInstanceOf(AccountAcl::class, $accountAcl);
+            $this->assertInstanceOf(\SP\Services\Account\AccountAcl::class, $accountAcl);
             $this->assertTrue($accountAcl->isCompiledAccountAccess());
             $this->assertTrue($accountAcl->isCompiledShowAccess());
 
@@ -749,7 +750,7 @@ class AccountAclServiceTest extends DatabaseTestCase
             ->reset()
             ->setAccFiles($profile);
 
-        $accountAcl = (new AccountAcl(0))
+        $accountAcl = (new \SP\Services\Account\AccountAcl(0))
             ->setCompiledAccountAccess(true)
             ->setCompiledShowAccess(true)
             ->setResultView($should['view'])
diff --git a/test/SP/Services/Account/AccountSearchServiceTest.php b/test/SP/Services/Account/AccountSearchServiceTest.php
index 7d9ecca3..18c2e633 100644
--- a/test/SP/Services/Account/AccountSearchServiceTest.php
+++ b/test/SP/Services/Account/AccountSearchServiceTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -24,11 +24,10 @@
 
 namespace SP\Test\Services\Account;
 
-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountSearchItem;
 use SP\Core\Context\ContextInterface;
 use SP\DataModel\UserPreferencesData;
 use SP\Mvc\Model\QueryCondition;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\Account\AccountSearchService;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
@@ -137,7 +136,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
     {
         $rows = count($accountsId);
 
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setCategoryId($id);
 
@@ -146,7 +145,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
         $this->assertInstanceOf(QueryResult::class, $result);
 
         if ($rows > 0) {
-            /** @var AccountSearchItem[] $data */
+            /** @var \SP\Services\Account\AccountSearchItem[] $data */
             $data = $result->getDataAsArray();
 
             $i = 0;
@@ -187,7 +186,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
     {
         $rows = count($accountsId);
 
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId($id);
 
@@ -196,7 +195,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
         $this->assertEquals($rows, $result->getNumRows());
 
         if ($rows > 0) {
-            /** @var AccountSearchItem[] $data */
+            /** @var \SP\Services\Account\AccountSearchItem[] $data */
             $data = $result->getDataAsArray();
 
             $i = 0;
@@ -222,7 +221,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
     {
         $rows = count($accountsId);
 
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setFilterOperator($operator);
         $searchFilter->setClientId($clientId);
@@ -234,7 +233,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
 
         $i = 0;
 
-        /** @var AccountSearchItem $item */
+        /** @var \SP\Services\Account\AccountSearchItem $item */
         foreach ($result->getDataAsArray() as $item) {
             $this->assertEquals($accountsId[$i], $item->getAccountSearchVData()->getId());
             $i++;
@@ -248,7 +247,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
      */
     private function checkNonExistantClient()
     {
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId(10);
 
@@ -270,7 +269,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
     {
         $rows = count($accountsId);
 
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setTxtSearch($string);
 
@@ -281,7 +280,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
 
         $i = 0;
 
-        /** @var AccountSearchItem $item */
+        /** @var \SP\Services\Account\AccountSearchItem $item */
         foreach ($result->getDataAsArray() as $item) {
             $this->assertEquals($accountsId[$i], $item->getAccountSearchVData()->getId());
 
@@ -299,7 +298,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
      */
     private function checkFavorites($rows, array $accountsId = [])
     {
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setSearchFavorites(true);
 
@@ -310,7 +309,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
 
         $i = 0;
 
-        /** @var AccountSearchItem $item */
+        /** @var \SP\Services\Account\AccountSearchItem $item */
         foreach ($result->getDataAsArray() as $item) {
             $this->assertEquals($accountsId[$i], $item->getAccountSearchVData()->getId());
             $i++;
@@ -330,7 +329,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
     {
         $rows = count($accountsId);
 
-        $searchFilter = new AccountSearchFilter();
+        $searchFilter = new \SP\Services\Account\AccountSearchFilter();
         $searchFilter->setLimitCount(10);
         $searchFilter->setFilterOperator($operator);
         $searchFilter->setTagsId($tagsId);
@@ -338,7 +337,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
         $result = self::$service->processSearchResults($searchFilter);
         $this->assertInstanceOf(QueryResult::class, $result);
 
-        /** @var AccountSearchItem[] $data */
+        /** @var \SP\Services\Account\AccountSearchItem[] $data */
         $data = $result->getDataAsArray();
 
         $this->assertEquals($rows, $result->getNumRows());
@@ -359,7 +358,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
      */
     public function testProcessSearchResultsForUserDemo()
     {
-        AccountSearchItem::$publicLinkEnabled = false;
+        \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = false;
 
         $userData = new UserLoginResponse();
         $userData->setId(2);
@@ -406,7 +405,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
      */
     public function testProcessSearchResultsForUserA()
     {
-        AccountSearchItem::$publicLinkEnabled = false;
+        \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = false;
 
         $userData = new UserLoginResponse();
         $userData->setId(3);
@@ -452,7 +451,7 @@ class AccountSearchServiceTest extends DatabaseTestCase
      */
     public function testProcessSearchResultsForUserB()
     {
-        AccountSearchItem::$publicLinkEnabled = false;
+        \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = false;
 
         $userData = new UserLoginResponse();
         $userData->setId(4);
diff --git a/test/SP/Services/Account/AccountServiceTest.php b/test/SP/Services/Account/AccountServiceTest.php
index b4550e62..e21a14ff 100644
--- a/test/SP/Services/Account/AccountServiceTest.php
+++ b/test/SP/Services/Account/AccountServiceTest.php
@@ -24,16 +24,15 @@
 
 namespace SP\Test\Services\Account;
 
-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\AccountData;
 use SP\DataModel\AccountVData;
-use SP\DataModel\Dto\AccountSearchResponse;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Account\AccountPasswordRequest;
+use SP\Services\Account\AccountRequest;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\Account\AccountService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
@@ -80,7 +79,7 @@ class AccountServiceTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $accountRequest = new AccountRequest();
+        $accountRequest = new \SP\Services\Account\AccountRequest();
         $accountRequest->name = 'Prueba 2';
         $accountRequest->login = 'admin';
         $accountRequest->url = 'http://syspass.org';
@@ -322,10 +321,11 @@ class AccountServiceTest extends DatabaseTestCase
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Core\Exceptions\SPException
+     * @throws \Exception
      */
     public function testUpdate()
     {
-        $accountRequest = new AccountRequest();
+        $accountRequest = new \SP\Services\Account\AccountRequest();
         $accountRequest->id = 1;
         $accountRequest->name = 'Prueba 1';
         $accountRequest->login = 'admin';
@@ -394,7 +394,7 @@ class AccountServiceTest extends DatabaseTestCase
         $this->assertEquals(3, $groups[1]->getId());
         $this->assertEquals(0, (int)$groups[1]->isEdit);
 
-        $accountRequest = new AccountRequest();
+        $accountRequest = new \SP\Services\Account\AccountRequest();
         $accountRequest->id = 3;
 
         self::$service->update($accountRequest);
@@ -453,79 +453,65 @@ class AccountServiceTest extends DatabaseTestCase
         $searchFilter->setCategoryId(1);
 
         // Comprobar un Id de categoría
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
+        $this->assertCount(1, $result);
 
         // Comprobar un Id de categoría no existente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setCategoryId(10);
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertCount(0, $result);
 
         // Comprobar un Id de cliente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId(1);
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
+        $this->assertCount(1, $result);
 
         // Comprobar un Id de cliente no existente
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setClientId(10);
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertCount(0, $result);
 
         // Comprobar una cadena de texto
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setCleanTxtSearch('apple.com');
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
-        $this->assertEquals(2, $response->getData()[0]->getId());
+        $this->assertCount(1, $result);
+        $this->assertEquals(2, $result[0]->getId());
 
         // Comprobar los favoritos
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setSearchFavorites(true);
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(0, $response->getCount());
-        $this->assertCount(0, $response->getData());
+        $this->assertCount(0, $result);
 
         // Comprobar las etiquetas
         $searchFilter->reset();
         $searchFilter->setLimitCount(10);
         $searchFilter->setTagsId([1]);
 
-        $response = self::$service->getByFilter($searchFilter);
+        $result = self::$service->getByFilter($searchFilter);
 
-        $this->assertInstanceOf(AccountSearchResponse::class, $response);
-        $this->assertEquals(1, $response->getCount());
-        $this->assertCount(1, $response->getData());
-        $this->assertEquals(1, $response->getData()[0]->getId());
+        $this->assertCount(1, $result);
+        $this->assertEquals(1, $result[0]->getId());
     }
 
     /**
diff --git a/test/SP/Services/Client/ClientServiceTest.php b/test/SP/Services/Client/ClientServiceTest.php
index fde141ba..76c78d7d 100644
--- a/test/SP/Services/Client/ClientServiceTest.php
+++ b/test/SP/Services/Client/ClientServiceTest.php
@@ -154,10 +154,17 @@ class ClientServiceTest extends DatabaseTestCase
      * @throws ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
-    public function testGetAllForUser()
+    public function testGetAllForUserAdmin()
     {
         $this->assertCount(3, self::$service->getAllForUser());
+    }
 
+    /**
+     * @throws ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
+     */
+    public function testGetAllForUser()
+    {
         $userData = new UserLoginResponse();
         $userData->setId(4);
 
@@ -174,8 +181,6 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Client');
-
         $data = new ClientData();
         $data->name = 'Cliente prueba';
         $data->description = 'Descripción prueba';
@@ -191,7 +196,7 @@ class ClientServiceTest extends DatabaseTestCase
 
         $countAfter = $this->conn->getRowCount('Client');
 
-        $this->assertEquals($countBefore + 1, $countAfter);
+        $this->assertEquals(4, $countAfter);
 
         $this->expectException(DuplicatedItemException::class);
 
diff --git a/test/SP/Services/Config/ConfigBackupServiceTest.php b/test/SP/Services/Config/ConfigBackupServiceTest.php
index 53dfe64f..4eaf3995 100644
--- a/test/SP/Services/Config/ConfigBackupServiceTest.php
+++ b/test/SP/Services/Config/ConfigBackupServiceTest.php
@@ -84,7 +84,7 @@ class ConfigBackupServiceTest extends TestCase
      * @throws \SP\Core\Context\ContextException
      * @throws \SP\Core\Exceptions\ConfigException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testRestore(ConfigData $configData)
     {
diff --git a/test/SP/Services/Export/XmlExportServiceTest.php b/test/SP/Services/Export/XmlExportServiceTest.php
index 08903e33..edf0a465 100644
--- a/test/SP/Services/Export/XmlExportServiceTest.php
+++ b/test/SP/Services/Export/XmlExportServiceTest.php
@@ -62,7 +62,7 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Context\ContextException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoExportWithoutPassword()
     {
@@ -84,7 +84,7 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws \DI\NotFoundException
      * @throws \SP\Core\Context\ContextException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     private function verifyExportWithoutPassword($file)
     {
@@ -122,7 +122,7 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws \Defuse\Crypto\Exception\CryptoException
      * @throws \SP\Core\Context\ContextException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoExportWithPassword()
     {
@@ -147,7 +147,7 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws \Defuse\Crypto\Exception\CryptoException
      * @throws \SP\Core\Context\ContextException
      * @throws \SP\Services\ServiceException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     private function verifyExportWithPassword($file, $password)
     {
diff --git a/test/SP/Services/Import/CsvImportTest.php b/test/SP/Services/Import/CsvImportTest.php
index b88a50dd..21f5c427 100644
--- a/test/SP/Services/Import/CsvImportTest.php
+++ b/test/SP/Services/Import/CsvImportTest.php
@@ -72,7 +72,7 @@ class CsvImportTest extends DatabaseTestCase
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImport()
     {
@@ -164,7 +164,7 @@ class CsvImportTest extends DatabaseTestCase
      * @throws \DI\DependencyException
      * @throws \DI\NotFoundException
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImportInvalidData()
     {
diff --git a/test/SP/Services/Import/KeepassImportTest.php b/test/SP/Services/Import/KeepassImportTest.php
index 5cf7ec48..28af0bf9 100644
--- a/test/SP/Services/Import/KeepassImportTest.php
+++ b/test/SP/Services/Import/KeepassImportTest.php
@@ -25,8 +25,8 @@
 namespace SP\Tests\Services\Import;
 
 use DI\Container;
-use SP\Account\AccountSearchFilter;
 use SP\Core\Crypt\Crypt;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\Account\AccountService;
 use SP\Services\Category\CategoryService;
 use SP\Services\Client\ClientService;
@@ -75,7 +75,7 @@ class KeepassImportTest extends DatabaseTestCase
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Core\Exceptions\SPException
      * @throws \SP\Repositories\NoSuchItemException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImport()
     {
@@ -126,7 +126,7 @@ class KeepassImportTest extends DatabaseTestCase
         $filter = new AccountSearchFilter();
         $filter->setClientId($client->getId());
 
-        $data = $accountService->getByFilter($filter)->getData();
+        $data = $accountService->getByFilter($filter);
 
         $this->assertCount(5, $data);
 
diff --git a/test/SP/Services/Import/SyspassImportTest.php b/test/SP/Services/Import/SyspassImportTest.php
index 28be4da8..3ee986b9 100644
--- a/test/SP/Services/Import/SyspassImportTest.php
+++ b/test/SP/Services/Import/SyspassImportTest.php
@@ -73,7 +73,7 @@ class SyspassImportTest extends DatabaseTestCase
      * @throws \SP\Core\Exceptions\QueryException
      * @throws \SP\Repositories\NoSuchItemException
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImport()
     {
@@ -227,7 +227,7 @@ class SyspassImportTest extends DatabaseTestCase
 
     /**
      * @throws ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImportInvalidData()
     {
diff --git a/test/SP/Services/Import/XmlFileImportTest.php b/test/SP/Services/Import/XmlFileImportTest.php
index 65ee69ef..6a2277dc 100644
--- a/test/SP/Services/Import/XmlFileImportTest.php
+++ b/test/SP/Services/Import/XmlFileImportTest.php
@@ -39,7 +39,7 @@ class XmlFileImportTest extends TestCase
 
     /**
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDetectXMLFormat()
     {
@@ -58,7 +58,7 @@ class XmlFileImportTest extends TestCase
 
     /**
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testInvalidFile()
     {
@@ -71,7 +71,7 @@ class XmlFileImportTest extends TestCase
 
     /**
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testEmptyFile()
     {
diff --git a/test/SP/Services/Import/XmlImportTest.php b/test/SP/Services/Import/XmlImportTest.php
index 79c15b87..180793ae 100644
--- a/test/SP/Services/Import/XmlImportTest.php
+++ b/test/SP/Services/Import/XmlImportTest.php
@@ -62,7 +62,7 @@ class XmlImportTest extends DatabaseTestCase
 
     /**
      * @throws \SP\Services\Import\ImportException
-     * @throws \SP\Storage\FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDoImport()
     {
diff --git a/test/SP/Services/Install/InstallerTest.php b/test/SP/Services/Install/InstallerTest.php
index 22d47828..6eb978b1 100644
--- a/test/SP/Services/Install/InstallerTest.php
+++ b/test/SP/Services/Install/InstallerTest.php
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
 use SP\Services\Crypt\MasterPassService;
 use SP\Services\Install\InstallData;
 use SP\Services\Install\Installer;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\MySQLHandler;
 use SP\Util\Util;
 use function SP\Test\getResource;
@@ -285,7 +285,7 @@ class InstallerTest extends TestCase
         $installer = self::$dic->get(Installer::class);
         $installer->run($params);
 
-        $this->assertTrue(DBUtil::checkDatabaseExist(self::$dic->get(MySQLHandler::class), self::DB_NAME));
+        $this->assertTrue(DatabaseUtil::checkDatabaseExist(self::$dic->get(MySQLHandler::class), self::DB_NAME));
 
         $configData = self::$dic->get(Config::class)->getConfigData();
 
diff --git a/test/SP/Storage/FileHandlerTest.php b/test/SP/Storage/FileHandlerTest.php
index ffe5da27..71f268b3 100644
--- a/test/SP/Storage/FileHandlerTest.php
+++ b/test/SP/Storage/FileHandlerTest.php
@@ -25,13 +25,13 @@
 namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
-use SP\Storage\FileException;
-use SP\Storage\FileHandler;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileHandler;
 
 /**
  * Class FileHandlerTest
  *
- * Tests unitarios para comprobar el funcionamiento de la clase SP\Storage\FileHandler
+ * Tests unitarios para comprobar el funcionamiento de la clase SP\Storage\File\FileHandler
  *
  * @package SP\Tests
  */
@@ -53,7 +53,7 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar la escritura de texto en un archivo
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testWrite()
     {
@@ -74,7 +74,7 @@ class FileHandlerTest extends TestCase
      */
     public function testCheckIsWritable()
     {
-        (new FileHandler(self::$validFile))
+        (new \SP\Storage\File\FileHandler(self::$validFile))
             ->clearCache()
             ->checkIsWritable();
 
@@ -84,11 +84,11 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar el tamaño del archivo
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testGetFileSize()
     {
-        $size = (new FileHandler(self::$validFile))->getFileSize();
+        $size = (new \SP\Storage\File\FileHandler(self::$validFile))->getFileSize();
 
         $this->assertEquals(10, $size);
     }
@@ -101,13 +101,13 @@ class FileHandlerTest extends TestCase
      */
     public function testCheckFileExists()
     {
-        (new FileHandler(self::$validFile))
+        (new \SP\Storage\File\FileHandler(self::$validFile))
             ->clearCache()
             ->checkFileExists();
 
-        $this->expectException(FileException::class);
+        $this->expectException(\SP\Storage\File\FileException::class);
 
-        (new FileHandler(self::$missingFile))
+        (new \SP\Storage\File\FileHandler(self::$missingFile))
             ->clearCache()
             ->checkFileExists();
     }
@@ -115,11 +115,11 @@ class FileHandlerTest extends TestCase
     /**
      * Abrir un archivo
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testOpenAndRead()
     {
-        $handler = new FileHandler(self::$validFile);
+        $handler = new \SP\Storage\File\FileHandler(self::$validFile);
         $handler->open('rb');
         $this->assertEquals('valid_file', $handler->read());
         $this->assertEquals('valid_file', $handler->readToString());
@@ -128,7 +128,7 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar a cerrar un archivo
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testClose()
     {
@@ -136,7 +136,7 @@ class FileHandlerTest extends TestCase
         $handler->open('rb');
         $handler->close();
 
-        $this->expectException(FileException::class);
+        $this->expectException(\SP\Storage\File\FileException::class);
         $handler->close();
     }
 
@@ -144,7 +144,7 @@ class FileHandlerTest extends TestCase
      * Comprobar si es posible leer el archivo
      *
      * @doesNotPerformAssertions
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testCheckIsReadable()
     {
@@ -156,11 +156,11 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar la eliminación de un archivo
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testDelete()
     {
-        (new FileHandler(self::$validFile))->delete();
+        (new \SP\Storage\File\FileHandler(self::$validFile))->delete();
 
         $this->assertFileNotExists(self::$validFile);
     }
diff --git a/test/SP/Storage/XmlHandlerTest.php b/test/SP/Storage/XmlHandlerTest.php
index 38b02ca5..dc32082d 100644
--- a/test/SP/Storage/XmlHandlerTest.php
+++ b/test/SP/Storage/XmlHandlerTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -25,21 +25,20 @@
 namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
-use SP\Storage\FileException;
-use SP\Storage\FileHandler;
-use SP\Storage\XmlHandler;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileHandler;
 
 /**
  * Class XmlHandlerTest
  *
- * Tests unitarios para comprobar el funcionamiento de la clase SP\Storage\XmlHandler
+ * Tests unitarios para comprobar el funcionamiento de la clase SP\Storage\File\XmlHandler
  *
  * @package SP\Tests
  */
 class XmlHandlerTest extends TestCase
 {
     /**
-     * @var XmlHandler
+     * @var \SP\Storage\File\XmlHandler
      */
     protected static $xmlHandler;
     /**
@@ -54,7 +53,7 @@ class XmlHandlerTest extends TestCase
     public static function setUpBeforeClass()
     {
         $file = RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config.xml';
-        self::$xmlHandler = new XmlHandler(new FileHandler($file));
+        self::$xmlHandler = new \SP\Storage\File\XmlHandler(new FileHandler($file));
 
         self::$itemsData = new \stdClass();
         self::$itemsData->configString = 'Hello world.';
@@ -76,7 +75,7 @@ class XmlHandlerTest extends TestCase
     /**
      * Test para comprobar la carga de un archivo XML
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testLoadMissingNode()
     {
@@ -88,7 +87,7 @@ class XmlHandlerTest extends TestCase
     /**
      * Test para comprobar la carga de un archivo XML
      *
-     * @throws FileException
+     * @throws \SP\Storage\File\FileException
      */
     public function testLoad()
     {
diff --git a/test/SP/bootstrap.php b/test/SP/bootstrap.php
index a1d8ac4b..c887d221 100644
--- a/test/SP/bootstrap.php
+++ b/test/SP/bootstrap.php
@@ -25,7 +25,6 @@
 namespace SP\Test;
 
 use DI\ContainerBuilder;
-use Doctrine\Common\Cache\ArrayCache;
 use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
 use SP\DataModel\ProfileData;
@@ -111,7 +110,7 @@ function setupContext()
     // Instancia del contenedor de dependencias con las definiciones de los objetos necesarios
     // para la aplicación
     $builder = new ContainerBuilder();
-    $builder->setDefinitionCache(new ArrayCache());
+//    $builder->setDefinitionCache(new ArrayCache());
     $builder->addDefinitions(APP_ROOT . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'Definitions.php');
     $dic = $builder->build();
 
diff --git a/test/res/config/config.xml b/test/res/config/config.xml
index cb50b044..5fa126f9 100644
--- a/test/res/config/config.xml
+++ b/test/res/config/config.xml
@@ -9,11 +9,11 @@
   <authBasicAutoLoginEnabled>1</authBasicAutoLoginEnabled>
   <authBasicDomain></authBasicDomain>
   <authBasicEnabled>1</authBasicEnabled>
-  <backup_hash>3a2b2fe9e1edb1c98c29c6e454e7d0b942382717</backup_hash>
+  <backup_hash>a34b6bbcf364639484af32241b103f5ad60442a0</backup_hash>
   <checkUpdates>0</checkUpdates>
   <checknotices>0</checknotices>
-  <configDate>1532557463</configDate>
-  <configHash>9d6f26441038788146ac0b36a21d2e299120518f</configHash>
+  <configDate>1532797944</configDate>
+  <configHash>8e1ffbe2853cb508edda1e90ed956de1d2c06c48</configHash>
   <configSaver></configSaver>
   <configVersion></configVersion>
   <databaseVersion></databaseVersion>
@@ -32,7 +32,7 @@
   <dokuwikiUrlBase></dokuwikiUrlBase>
   <dokuwikiUser></dokuwikiUser>
   <encryptSession>0</encryptSession>
-  <export_hash>ec6de9dab12089f334fdfa283bd8ba00938696d2</export_hash>
+  <export_hash>d9e8f26689c101cf291a03e21bcbeb38353505c0</export_hash>
   <filesAllowedExts>
     <item type="filesAllowedExts">PDF</item>
     <item type="filesAllowedExts">JPG</item>