diff --git a/.classpath b/.classpath
index 5e3ac91..cc0fc57 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/main/java">
+		<attributes>
+			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources">
+		<attributes>
+			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/test/java">
+		<attributes>
+			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/test/resources">
+		<attributes>
+			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index ad7c177..7e0fccd 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -4,7 +4,8 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.java.home=null
 connection.jvm.arguments=
 connection.project.dir=../ch.psi.daq.buildall
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
-natures=org.eclipse.jdt.core.javanature
+natures=org.eclipse.jdt.core.javanature,org.eclipse.buildship.core.gradleprojectnature
 project.path=\:ch.psi.daq.queryrest
diff --git a/src/test/resources/queryrest-test.properties b/src/test/resources/queryrest-test.properties
index 96882b9..e070f88 100644
--- a/src/test/resources/queryrest-test.properties
+++ b/src/test/resources/queryrest-test.properties
@@ -1,3 +1,6 @@
 backend.default=sf-databuffer
 
-query.min.time=1970-01-01T00:00:00.000000000+00:00
\ No newline at end of file
+query.min.time=1970-01-01T00:00:00.000000000+00:00
+
+# enables write delay (in seconds - 0 to disable) for ChannelConfigurationFileMapStore (commits are batched and async)
+filestorage.config.write.delay=0
\ No newline at end of file