diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2993acd..25f45d6 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -55,91 +55,6 @@ parameters:
 			count: 1
 			path: src/bundle/DependencyInjection/Configuration.php
 
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:buildBoostFactorMap\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:buildBoostFactorMap\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureBoostMap\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureBoostMap\\(\\) has parameter \\$connectionParams with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureIndexingDepth\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureIndexingDepth\\(\\) has parameter \\$connectionParams with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureSearchServices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:configureSearchServices\\(\\) has parameter \\$connectionParams with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:defineEndpoint\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:defineEndpoint\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:getConfiguration\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:load\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:load\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:processConnectionConfiguration\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\DependencyInjection\\\\IbexaSolrExtension\\:\\:processConnectionConfiguration\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Parameter \\#1 \\$configuration of method Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\Extension\\:\\:processConfiguration\\(\\) expects Symfony\\\\Component\\\\Config\\\\Definition\\\\ConfigurationInterface, Symfony\\\\Component\\\\Config\\\\Definition\\\\ConfigurationInterface\\|null given\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaSolrExtension.php
-
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\Solr\\\\IbexaSolrBundle\\:\\:build\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/IbexaSolrBundle.php
-
 		-
 			message: "#^Method Ibexa\\\\Contracts\\\\Solr\\\\Query\\\\CriterionVisitor\\:\\:escapeQuote\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
@@ -180,61 +95,6 @@ parameters:
 			count: 1
 			path: src/contracts/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper.php
 
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateCriterionVisitorPass\\:\\:addHandlers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateCriterionVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateCriterionVisitorPass\\:\\:addHandlers\\(\\) has parameter \\$handlers with no type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateCriterionVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateCriterionVisitorPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateCriterionVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateFacetBuilderVisitorPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateFacetBuilderVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateFacetBuilderVisitorPass\\:\\:processVisitors\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateFacetBuilderVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateFacetBuilderVisitorPass\\:\\:processVisitors\\(\\) has parameter \\$name with no type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateFacetBuilderVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateSortClauseVisitorPass\\:\\:addHandlers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateSortClauseVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateSortClauseVisitorPass\\:\\:addHandlers\\(\\) has parameter \\$handlers with no type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateSortClauseVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\AggregateSortClauseVisitorPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/AggregateSortClauseVisitorPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\BaseFieldMapperPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/BaseFieldMapperPass.php
-
-		-
-			message: "#^Method Ibexa\\\\Solr\\\\Container\\\\Compiler\\\\EndpointRegistryPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Container/Compiler/EndpointRegistryPass.php
-
 		-
 			message: "#^Method Ibexa\\\\Solr\\\\CoreFilter\\:\\:apply\\(\\) has no return type specified\\.$#"
 			count: 1