diff --git a/.project b/.project
index e824f9f..3a3b8a1 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,5 +25,6 @@
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/main/java/ch/psi/daq/rest/config/RestConfig.java b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
index 7d3a2c9..643c997 100644
--- a/src/main/java/ch/psi/daq/rest/config/RestConfig.java
+++ b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
@@ -19,8 +19,8 @@ import com.google.common.collect.Sets;
 
 import ch.psi.daq.common.statistic.StorelessStatistics;
 import ch.psi.daq.domain.cassandra.ChannelEvent;
-import ch.psi.daq.query.config.HazelcastClientConfig;
-import ch.psi.daq.query.config.HazelcastConfig;
+import ch.psi.daq.query.config.QueryClientConfig;
+import ch.psi.daq.query.config.QueryConfig;
 import ch.psi.daq.rest.model.PropertyFilterMixin;
 import ch.psi.daq.rest.response.ResponseStreamWriter;
 
@@ -37,7 +37,7 @@ public class RestConfig {
    // see:
    // https://jira.spring.io/browse/SPR-10409?focusedCommentId=101393&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-101393
    @Configuration
-   @Import({HazelcastConfig.class, HazelcastClientConfig.class})
+   @Import({QueryConfig.class, QueryClientConfig.class})
    static class InnerConfiguration {
    }