diff --git a/application/Espo/Core/Controllers/RecordBase.php b/application/Espo/Core/Controllers/RecordBase.php
index 58743dcfab..1ee484b3b2 100644
--- a/application/Espo/Core/Controllers/RecordBase.php
+++ b/application/Espo/Core/Controllers/RecordBase.php
@@ -96,6 +96,9 @@ class RecordBase extends Base implements Di\EntityManagerAware, Di\InjectableFac
      */
     protected $recordServiceContainer;
 
+    /**
+     * @var Config
+     */
     protected $config;
 
     /**
@@ -103,11 +106,13 @@ class RecordBase extends Base implements Di\EntityManagerAware, Di\InjectableFac
      */
     protected $user;
 
+    /**
+     * @var Acl
+     */
     protected $acl;
 
     /**
      * @deprecated
-     *
      * @var EntityManager
      */
     protected $entityManager;
diff --git a/application/Espo/Core/ExternalAccount/ClientManager.php b/application/Espo/Core/ExternalAccount/ClientManager.php
index 1b22d0e066..1c8ad151f3 100644
--- a/application/Espo/Core/ExternalAccount/ClientManager.php
+++ b/application/Espo/Core/ExternalAccount/ClientManager.php
@@ -52,10 +52,19 @@ class ClientManager
      */
     protected $entityManager;
 
+    /**
+     * @var Metadata
+     */
     protected $metadata;
 
+    /**
+     * @var Config
+     */
     protected $config;
 
+    /**
+     * @var InjectableFactory|null
+     */
     protected $injectableFactory = null;
 
     protected $clientMap = [];
diff --git a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
index 91341ce7cc..beabc57cfc 100644
--- a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
+++ b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
@@ -53,18 +53,39 @@ use Espo\{
 
 class MassConvertCurrency implements MassAction
 {
+    /**
+     * @var QueryBuilder
+     */
     protected $queryBuilder;
 
+    /**
+     * @var Acl
+     */
     protected $acl;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var FieldUtil
+     */
     protected $fieldUtil;
 
+    /**
+     * @var Metadata
+     */
     protected $metadata;
 
+    /**
+     * @var CurrencyConfigDataProvider
+     */
     protected $configDataProvider;
 
+    /**
+     * @var CurrencyConverter
+     */
     protected $currencyConverter;
 
     public function __construct(
@@ -128,7 +149,7 @@ class MassConvertCurrency implements MassAction
         $query = $this->queryBuilder->build($params);
 
         $collection = $this->entityManager
-            ->getRepository($entityType)
+            ->getRDBRepository($entityType)
             ->clone($query)
             ->sth()
             ->find();
@@ -144,7 +165,7 @@ class MassConvertCurrency implements MassAction
 
             $this->convertEntity($entity, $fieldList, $targetCurrency, $rates);
 
-            $ids[] = $entity->id;
+            $ids[] = $entity->getId();
 
             $count++;
         }
diff --git a/application/Espo/Core/MassAction/Actions/MassDelete.php b/application/Espo/Core/MassAction/Actions/MassDelete.php
index 30bfab825a..2311384a0b 100644
--- a/application/Espo/Core/MassAction/Actions/MassDelete.php
+++ b/application/Espo/Core/MassAction/Actions/MassDelete.php
@@ -43,10 +43,19 @@ use Espo\Core\{
 
 class MassDelete implements MassAction
 {
+    /**
+     * @var QueryBuilder
+     */
     protected $queryBuilder;
 
+    /**
+     * @var Acl
+     */
     protected $acl;
 
+    /**
+     * @var RecordServiceContainer
+     */
     protected $recordServiceContainer;
 
     /**
diff --git a/application/Espo/Core/MassAction/Actions/MassRecalculateFormula.php b/application/Espo/Core/MassAction/Actions/MassRecalculateFormula.php
index 97cb8dd430..d40df51c96 100644
--- a/application/Espo/Core/MassAction/Actions/MassRecalculateFormula.php
+++ b/application/Espo/Core/MassAction/Actions/MassRecalculateFormula.php
@@ -39,16 +39,23 @@ use Espo\Core\{
     Exceptions\Forbidden,
 };
 
-use Espo\{
-    Entities\User,
-};
+use Espo\Entities\User;
 
 class MassRecalculateFormula implements MassAction
 {
+    /**
+     * @var QueryBuilder
+     */
     protected $queryBuilder;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var User
+     */
     protected $user;
 
     public function __construct(
@@ -72,7 +79,7 @@ class MassRecalculateFormula implements MassAction
         $query = $this->queryBuilder->build($params);
 
         $collection = $this->entityManager
-            ->getRepository($entityType)
+            ->getRDBRepository($entityType)
             ->clone($query)
             ->sth()
             ->find();
@@ -84,7 +91,7 @@ class MassRecalculateFormula implements MassAction
         foreach ($collection as $entity) {
             $this->entityManager->saveEntity($entity);
 
-            $ids[] = $entity->id;
+            $ids[] = $entity->getId();
 
             $count++;
         }
diff --git a/application/Espo/Core/MassAction/Actions/MassUpdate.php b/application/Espo/Core/MassAction/Actions/MassUpdate.php
index 660170c32f..9cb8569239 100644
--- a/application/Espo/Core/MassAction/Actions/MassUpdate.php
+++ b/application/Espo/Core/MassAction/Actions/MassUpdate.php
@@ -50,10 +50,19 @@ use stdClass;
 
 class MassUpdate implements MassAction
 {
+    /**
+     * @var QueryBuilder
+     */
     protected $queryBuilder;
 
+    /**
+     * @var Acl
+     */
     protected $acl;
 
+    /**
+     * @var RecordServiceContainer
+     */
     protected $recordServiceContainer;
 
     /**
@@ -61,6 +70,9 @@ class MassUpdate implements MassAction
      */
     protected $entityManager;
 
+    /**
+     * @var FieldUtil
+     */
     protected $fieldUtil;
 
     public function __construct(
diff --git a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php
index 7cebb84d50..6e8cb324e5 100644
--- a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php
+++ b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php
@@ -41,10 +41,19 @@ use Espo\Core\Notification\AssignmentNotificator\Params;
 
 class DefaultAssignmentNotificator implements AssignmentNotificator
 {
+    /**
+     * @var User
+     */
     protected $user;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var UserEnabledChecker
+     */
     protected $userChecker;
 
     public function __construct(User $user, EntityManager $entityManager, UserEnabledChecker $userChecker)
diff --git a/application/Espo/Core/ORM/RepositoryFactory.php b/application/Espo/Core/ORM/RepositoryFactory.php
index 1e59a09299..c99e7c403e 100644
--- a/application/Espo/Core/ORM/RepositoryFactory.php
+++ b/application/Espo/Core/ORM/RepositoryFactory.php
@@ -48,10 +48,19 @@ class RepositoryFactory implements RepositoryFactoryInterface
 {
     protected $defaultClassName = DatabaseRepository::class;
 
+    /**
+     * @var EntityFactoryInteface
+     */
     protected $entityFactory;
 
+    /**
+     * @var InjectableFactory
+     */
     protected $injectableFactory;
 
+    /**
+     * @var ClassFinder
+     */
     protected $classFinder;
 
     public function __construct(
diff --git a/application/Espo/Core/Password/Recovery.php b/application/Espo/Core/Password/Recovery.php
index 753b3c9677..d22e957233 100644
--- a/application/Espo/Core/Password/Recovery.php
+++ b/application/Espo/Core/Password/Recovery.php
@@ -58,16 +58,34 @@ class Recovery
 
     const REQUEST_LIFETIME = '3 hours';
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var Config
+     */
     protected $config;
 
+    /**
+     * @var EmailSender
+     */
     protected $emailSender;
 
+    /**
+     * @var HtmlizerFactory
+     */
     protected $htmlizerFactory;
 
+    /**
+     * @var TemplateFileManager
+     */
     protected $templateFileManager;
 
+    /**
+     * @var Log
+     */
     private $log;
 
     public function __construct(
@@ -96,7 +114,7 @@ class Recovery
         }
 
         $request = $em
-            ->getRepository('PasswordChangeRequest')
+            ->getRDBRepository('PasswordChangeRequest')
             ->where([
                 'requestId' => $id,
             ])
@@ -119,7 +137,7 @@ class Recovery
         $em = $this->entityManager;
 
         $request = $em
-            ->getRepository('PasswordChangeRequest')
+            ->getRDBRepository('PasswordChangeRequest')
             ->where([
                 'requestId' => $id,
             ])
@@ -142,7 +160,7 @@ class Recovery
         }
 
         $user = $em
-           ->getRepository('User')
+           ->getRDBRepository('User')
             ->where([
                 'userName' => $userName,
                 'emailAddress' => $emailAddress,
@@ -196,9 +214,9 @@ class Recovery
         }
 
         $passwordChangeRequest = $em
-            ->getRepository('PasswordChangeRequest')
+            ->getRDBRepository('PasswordChangeRequest')
             ->where([
-                'userId' => $user->id,
+                'userId' => $user->getId(),
             ])
             ->findOne();
 
@@ -293,12 +311,12 @@ class Recovery
         $siteUrl = $config->getSiteUrl();
 
         if ($user->isPortal()) {
-            $portal = $em->getRepository('Portal')
+            $portal = $em->getRDBRepository('Portal')
                 ->distinct()
                 ->join('users')
                 ->where([
                     'isActive' => true,
-                    'users.id' => $user->id,
+                    'users.id' => $user->getId(),
                 ])
                 ->findOne();
 
diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
index c1b29af5cc..7b215ade7a 100644
--- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php
+++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
@@ -53,22 +53,49 @@ class ItemGeneralConverter implements ItemConverter
 {
     protected $entityType;
 
+    /**
+     * @var User
+     */
     protected $user;
 
+    /**
+     * @var DateTimeItemTransformer
+     */
     protected $dateTimeItemTransformer;
 
+    /**
+     * @var Scanner
+     */
     protected $scanner;
 
+    /**
+     * @var ItemConverterFactory
+     */
     protected $itemConverterFactory;
 
+    /**
+     * @var RandomStringGenerator
+     */
     protected $randomStringGenerator;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var ORMDefs
+     */
     protected $ormDefs;
 
+    /**
+     * @var Config
+     */
     protected $config;
 
+    /**
+     * @var Metadata
+     */
     protected $metadata;
 
     public function __construct(
diff --git a/application/Espo/Tools/Export/Processors/Xlsx.php b/application/Espo/Tools/Export/Processors/Xlsx.php
index 9eb5e4274e..c0c1618752 100644
--- a/application/Espo/Tools/Export/Processors/Xlsx.php
+++ b/application/Espo/Tools/Export/Processors/Xlsx.php
@@ -70,18 +70,39 @@ use RuntimeException;
  */
 class Xlsx implements Processor
 {
+    /**
+     * @var Config
+     */
     protected $config;
 
+    /**
+     * @var Metadata
+     */
     protected $metadata;
 
+    /**
+     * @var Language
+     */
     protected $language;
 
+    /**
+     * @var DateTimeUtil
+     */
     protected $dateTime;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
+    /**
+     * @var FileStorageManager
+     */
     protected $fileStorageManager;
 
+    /**
+     * @var AddressFormatterFactory
+     */
     protected $addressFormatterFactory;
 
     public function __construct(
diff --git a/application/Espo/Tools/LeadCapture/LeadCapture.php b/application/Espo/Tools/LeadCapture/LeadCapture.php
index d7a1d69558..90c5ff9eaa 100644
--- a/application/Espo/Tools/LeadCapture/LeadCapture.php
+++ b/application/Espo/Tools/LeadCapture/LeadCapture.php
@@ -87,10 +87,13 @@ class LeadCapture
     /** @var Log */
     protected $log;
 
+    /** @var CampaignService */
     private $campaignService;
 
+    /** @var EmailTemplateService */
     private $emailTemplateService;
 
+    /** @var InboundEmailService */
     private $inboundEmailService;
 
     public function __construct(