diff --git a/composer.json b/composer.json
index b4030e0..8b81ac7 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
         "symfony/event-dispatcher": "^5.4",
         "symfony/http-foundation": "^5.4",
         "symfony/http-kernel": "^5.4",
+        "symfony/uid": "^5.4",
         "symfony/yaml": "^5.4"
     },
     "require-dev": {
diff --git a/src/contracts/Gateway/AbstractDoctrineDatabase.php b/src/contracts/Gateway/AbstractDoctrineDatabase.php
index 4c20b50..5b32ad8 100644
--- a/src/contracts/Gateway/AbstractDoctrineDatabase.php
+++ b/src/contracts/Gateway/AbstractDoctrineDatabase.php
@@ -117,7 +117,7 @@ public function countAll(): int
     }
 
     /**
-     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
+     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
      *
      * @throws \Doctrine\DBAL\Driver\Exception
      * @throws \Doctrine\DBAL\Exception
@@ -258,7 +258,7 @@ private function applyInheritance(QueryBuilder $qb): void
     }
 
     /**
-     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
+     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
      *
      * @return \Doctrine\DBAL\Query\Expression\CompositeExpression|string|null
      *
@@ -327,7 +327,7 @@ private function buildConditionExpression(ExpressionVisitor $visitor, QueryBuild
     }
 
     /**
-     * @param scalar|array<scalar>|null $value
+     * @param scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null $value
      *
      * @throws \Doctrine\DBAL\Exception
      * @throws \Ibexa\Contracts\CorePersistence\Exception\MappingException
@@ -431,7 +431,7 @@ final protected function applyOrderBy(QueryBuilder $qb, ?array $orderBy = []): v
     }
 
     /**
-     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
+     * @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
      */
     final protected function applyCriteria(QueryBuilder $qb, $criteria): void
     {
diff --git a/src/contracts/Gateway/GatewayInterface.php b/src/contracts/Gateway/GatewayInterface.php
index 248ccde..f9a77c1 100644
--- a/src/contracts/Gateway/GatewayInterface.php
+++ b/src/contracts/Gateway/GatewayInterface.php
@@ -23,7 +23,7 @@ public function getMetadata(): DoctrineSchemaMetadataInterface;
     public function countAll(): int;
 
     /**
-     * @param \Doctrine\Common\Collections\Expr\Expression|array<\Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>> $criteria
+     * @param \Doctrine\Common\Collections\Expr\Expression|array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria  $criteria
      */
     public function countBy($criteria): int;
 
@@ -33,7 +33,7 @@ public function countBy($criteria): int;
     public function findAll(?int $limit = null, int $offset = 0): array;
 
     /**
-     * @param \Doctrine\Common\Collections\Expr\Expression|array<\Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria Map of column names to values that will be used as part of WHERE query
+     * @param \Doctrine\Common\Collections\Expr\Expression|array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria  Map of column names to values that will be used as part of WHERE query
      * @param array<string, string>|null $orderBy Map of column names to "ASC" or "DESC", that will be used in SORT query
      *
      * @phpstan-param array<string, "ASC"|"DESC">|null $orderBy
@@ -43,7 +43,7 @@ public function findAll(?int $limit = null, int $offset = 0): array;
     public function findBy($criteria, ?array $orderBy = null, ?int $limit = null, int $offset = 0): array;
 
     /**
-     * @param array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria Map of column names to values that will be used as part of WHERE query
+     * @param array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria    Map of column names to values that will be used as part of WHERE query
      * @param array<string, string>|null $orderBy Map of column names to "ASC" or "DESC", that will be used in SORT query
      *
      * @phpstan-param array<string, "ASC"|"DESC">|null $orderBy