diff --git a/src/bundle/Resources/config/services/persistence.yaml b/src/bundle/Resources/config/services/query.yaml
similarity index 100%
rename from src/bundle/Resources/config/services/persistence.yaml
rename to src/bundle/Resources/config/services/query.yaml
diff --git a/src/contracts/Values/Query/Criterion/FieldValueCriterion.php b/src/contracts/Values/Query/Criterion/FieldValueCriterion.php
index 812396c..0337a1a 100644
--- a/src/contracts/Values/Query/Criterion/FieldValueCriterion.php
+++ b/src/contracts/Values/Query/Criterion/FieldValueCriterion.php
@@ -8,7 +8,7 @@
 
 namespace Ibexa\Contracts\CoreSearch\Values\Query\Criterion;
 
-class FieldValueCriterion implements CriterionInterface
+final class FieldValueCriterion implements CriterionInterface
 {
     /** @final */
     public const COMPARISON_EQ = '=';
diff --git a/src/contracts/Values/Query/Criterion/LogicalAnd.php b/src/contracts/Values/Query/Criterion/LogicalAnd.php
index b950ac6..3dd6644 100644
--- a/src/contracts/Values/Query/Criterion/LogicalAnd.php
+++ b/src/contracts/Values/Query/Criterion/LogicalAnd.php
@@ -8,6 +8,6 @@
 
 namespace Ibexa\Contracts\CoreSearch\Values\Query\Criterion;
 
-class LogicalAnd extends AbstractCompositeCriterion
+final class LogicalAnd extends AbstractCompositeCriterion
 {
 }
diff --git a/src/contracts/Values/Query/Criterion/LogicalOr.php b/src/contracts/Values/Query/Criterion/LogicalOr.php
index db044c1..f5c8f10 100644
--- a/src/contracts/Values/Query/Criterion/LogicalOr.php
+++ b/src/contracts/Values/Query/Criterion/LogicalOr.php
@@ -8,6 +8,6 @@
 
 namespace Ibexa\Contracts\CoreSearch\Values\Query\Criterion;
 
-class LogicalOr extends AbstractCompositeCriterion
+final class LogicalOr extends AbstractCompositeCriterion
 {
 }
diff --git a/src/contracts/Values/Query/SortClause/FieldValueSortClause.php b/src/contracts/Values/Query/SortClause/FieldValueSortClause.php
index 1e797d9..c249193 100644
--- a/src/contracts/Values/Query/SortClause/FieldValueSortClause.php
+++ b/src/contracts/Values/Query/SortClause/FieldValueSortClause.php
@@ -10,7 +10,7 @@
 
 use Ibexa\Contracts\CoreSearch\Values\Query\AbstractSortClause;
 
-class FieldValueSortClause extends AbstractSortClause
+final class FieldValueSortClause extends AbstractSortClause
 {
     private string $field;