diff --git a/build.gradle.kts b/build.gradle.kts
index 79480cc6..069f227b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,14 +35,10 @@ allprojects {
     // configure which version of the annotation processor to use. defaults to the same version as the plugin
     configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
         processorVersion.set(annotationProcessorVersion)
-        outputDirectory.set(project.buildDir)
+        outputDirectory.set(project.layout.buildDirectory.asFile.get())
     }
 
     configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
-        versions {
-            // override default dependency versions here
-            metaModel.set(metaModelVersion)
-        }
         pom {
             scmConnection.set(fccScmConnection)
             scmUrl.set(fccScmUrl)
diff --git a/core/federated-catalog-core/build.gradle.kts b/core/federated-catalog-core/build.gradle.kts
index 57b2ea38..e7a0e37e 100644
--- a/core/federated-catalog-core/build.gradle.kts
+++ b/core/federated-catalog-core/build.gradle.kts
@@ -26,6 +26,7 @@ dependencies {
 
     implementation(libs.edc.util)
     implementation(libs.edc.core.connector)
+    implementation(libs.edc.query.lib)
     implementation(libs.edc.core.transform)
     implementation(libs.edc.dsp.api.configuration)
     implementation(libs.edc.spi.jsonld)
@@ -35,7 +36,6 @@ dependencies {
     testImplementation(libs.edc.dsp.transform.catalog)
     testImplementation(libs.edc.core.transform)
     testImplementation(libs.edc.junit)
-    testImplementation(libs.edc.core.transform)
     testImplementation(libs.edc.ext.http)
     testImplementation(libs.awaitility)
 }
diff --git a/core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/FederatedCatalogDefaultServicesExtension.java b/core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/FederatedCatalogDefaultServicesExtension.java
index 192e0524..58db057d 100644
--- a/core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/FederatedCatalogDefaultServicesExtension.java
+++ b/core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/FederatedCatalogDefaultServicesExtension.java
@@ -22,10 +22,10 @@
 import org.eclipse.edc.catalog.spi.FederatedCacheStore;
 import org.eclipse.edc.catalog.spi.QueryEngine;
 import org.eclipse.edc.catalog.store.InMemoryFederatedCacheStore;
-import org.eclipse.edc.connector.core.store.CriterionOperatorRegistryImpl;
 import org.eclipse.edc.crawler.spi.TargetNodeDirectory;
 import org.eclipse.edc.crawler.spi.model.ExecutionPlan;
 import org.eclipse.edc.crawler.spi.model.RecurringExecutionPlan;
+import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
diff --git a/gradle.properties b/gradle.properties
index c84950ef..d1f71994 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,6 @@ version=0.5.2-SNAPSHOT
 # configure the build:
 annotationProcessorVersion=0.5.2-SNAPSHOT
 edcGradlePluginsVersion=0.5.2-SNAPSHOT
-metaModelVersion=0.5.2-SNAPSHOT
 
 # used for publishing artifacts and plugins
 fccScmConnection=scm:git:git@github.com:eclipse-edc/FederatedCatalog.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 069a78e8..5ad8b28d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,6 +29,7 @@ edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
 edc-ids = { module = "org.eclipse.edc:ids", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
+edc-query-lib = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }
 edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
 edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }