diff --git a/application/Espo/ORM/Metadata.php b/application/Espo/ORM/Metadata.php
index dd6baa9ff7..145a73f85d 100644
--- a/application/Espo/ORM/Metadata.php
+++ b/application/Espo/ORM/Metadata.php
@@ -41,18 +41,18 @@ use InvalidArgumentException;
  */
 class Metadata
 {
-    private $data;
-
-    private $defs;
-
-    private $defsData;
-
-    private $dataProvider;
-
     /**
-     * @var EventDispatcher
+     * @var array<string,mixed>
      */
-    private $eventDispatcher;
+    private array $data;
+
+    private Defs $defs;
+
+    private DefsData $defsData;
+
+    private MetadataDataProvider $dataProvider;
+
+    private EventDispatcher $eventDispatcher;
 
     public function __construct(MetadataDataProvider $dataProvider, ?EventDispatcher $eventDispatcher = null)
     {
@@ -89,6 +89,11 @@ class Metadata
 
     /**
      * Get a parameter or parameters by key. Key can be a string or array path.
+     *
+     * @param string $entityType An entity type.
+     * @param string[]|string|null $key A Key.
+     * @param mixed $default A default value.     *
+     * @return mixed
      */
     public function get(string $entityType, $key = null, $default = null)
     {
@@ -124,7 +129,10 @@ class Metadata
     }
 
     /**
+     * @param array<string,mixed> $data
      * @param string[]|string|null $key
+     * @param mixed $default A default value.
+     * @return mixed
      */
     private static function getValueByKey(array $data, $key = null, $default = null)
     {
diff --git a/application/Espo/ORM/MetadataDataProvider.php b/application/Espo/ORM/MetadataDataProvider.php
index 2c6df8a84c..3beb90d986 100644
--- a/application/Espo/ORM/MetadataDataProvider.php
+++ b/application/Espo/ORM/MetadataDataProvider.php
@@ -34,5 +34,8 @@ namespace Espo\ORM;
  */
 interface MetadataDataProvider
 {
+    /**
+     * @return array<string,mixed>
+     */
     public function get(): array;
 }
diff --git a/application/Espo/ORM/Query/BaseBuilderTrait.php b/application/Espo/ORM/Query/BaseBuilderTrait.php
index f5be4b497f..7604c599da 100644
--- a/application/Espo/ORM/Query/BaseBuilderTrait.php
+++ b/application/Espo/ORM/Query/BaseBuilderTrait.php
@@ -35,6 +35,8 @@ trait BaseBuilderTrait
 {
     /**
      * Must be protected for compatibility reasons.
+     *
+     * @var array<string,mixed>
      */
     protected $params = [];
 
diff --git a/application/Espo/ORM/Query/BaseTrait.php b/application/Espo/ORM/Query/BaseTrait.php
index dce7ad4f72..887014cada 100644
--- a/application/Espo/ORM/Query/BaseTrait.php
+++ b/application/Espo/ORM/Query/BaseTrait.php
@@ -31,10 +31,15 @@ namespace Espo\ORM\Query;
 
 trait BaseTrait
 {
+    /**
+     * @var array<string,mixed>
+     */
     private $params = [];
 
     /**
      * Get parameters in RAW format.
+     *
+     * @return array<string,mixed>
      */
     public function getRaw(): array
     {
@@ -43,6 +48,8 @@ trait BaseTrait
 
     /**
      * Create from RAW params.
+     *
+     * @param array<string,mixed> $params
      */
     public static function fromRaw(array $params): self
     {
@@ -55,6 +62,9 @@ trait BaseTrait
         return $obj;
     }
 
+    /**
+     * @param array<string,mixed> $params
+     */
     private function validateRawParams(array $params): void
     {
     }
diff --git a/application/Espo/ORM/Query/Delete.php b/application/Espo/ORM/Query/Delete.php
index 3c38414825..f1df16773b 100644
--- a/application/Espo/ORM/Query/Delete.php
+++ b/application/Espo/ORM/Query/Delete.php
@@ -29,8 +29,6 @@
 
 namespace Espo\ORM\Query;
 
-use Espo\ORM\Query\Part\WhereClause;
-
 use RuntimeException;
 
 /**
@@ -65,6 +63,9 @@ class Delete implements Query
         return $this->params['limit'] ?? null;
     }
 
+    /**
+     * @param array<string,mixed> $params
+     */
     private function validateRawParams(array $params): void
     {
         $this->validateRawParamsSelecting($params);
diff --git a/application/Espo/ORM/Query/Insert.php b/application/Espo/ORM/Query/Insert.php
index 86dba77e81..d2098a0c77 100644
--- a/application/Espo/ORM/Query/Insert.php
+++ b/application/Espo/ORM/Query/Insert.php
@@ -38,6 +38,9 @@ class Insert implements Query
 {
     use BaseTrait;
 
+    /**
+     * @param array<string,mixed> $params
+     */
     private function validateRawParams(array $params): void
     {
         $into = $params['into'] ?? null;
diff --git a/application/Espo/ORM/Query/InsertBuilder.php b/application/Espo/ORM/Query/InsertBuilder.php
index f74644fbde..e8f3642cb6 100644
--- a/application/Espo/ORM/Query/InsertBuilder.php
+++ b/application/Espo/ORM/Query/InsertBuilder.php
@@ -33,6 +33,9 @@ class InsertBuilder implements Builder
 {
     use BaseBuilderTrait;
 
+    /**
+     * @var array<string,mixed>
+     */
     protected $params = [];
 
     /**
@@ -73,6 +76,8 @@ class InsertBuilder implements Builder
 
     /**
      * What columns to set with values. A list of columns.
+     *
+     * @param string[] $columns
      */
     public function columns(array $columns): self
     {
@@ -83,6 +88,8 @@ class InsertBuilder implements Builder
 
     /**
      * What values to insert. A key-value map or a list of key-value maps.
+     *
+     * @param array<string,mixed> $values
      */
     public function values(array $values): self
     {
@@ -93,6 +100,8 @@ class InsertBuilder implements Builder
 
     /**
      * Values to set on duplicate key. A key-value map.
+     *
+     * @param array<string,mixed> $updateSet
      */
     public function updateSet(array $updateSet): self
     {
diff --git a/application/Espo/ORM/Query/LockTable.php b/application/Espo/ORM/Query/LockTable.php
index e4e014b41e..fee84b360a 100644
--- a/application/Espo/ORM/Query/LockTable.php
+++ b/application/Espo/ORM/Query/LockTable.php
@@ -42,6 +42,9 @@ class LockTable implements Query
 
     public const MODE_EXCLUSIVE = 'EXCLUSIVE';
 
+    /**
+     * @param array<string,mixed> $params
+     */
     protected function validateRawParams(array $params): void
     {
         if (empty($params['table'])) {