diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
index db5ab12..83778e7 100644
--- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
+++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfigParameterValueScripterObjectOrList.java
@@ -55,6 +55,6 @@ public class TPQConfigParameterValueScripterObjectOrList implements TPQConfigPar
 		String function = functionName+"("+queryParameter.getValueType()+",'"+value+"')";
 		
 		// Wrap in value holder because these values will not change anymore.
-		return PREFIX_JS+TPQFactory.ParameterValueFunction.CREATE_VALUE_HOLDER+"("+function+");";
+		return PREFIX_JS+TPQFactory.ParameterValueFunction.CREATE_VALUE_HOLDER+"("+function+");"; // TODO: check if prefix should be removed.
 	}
 }
diff --git a/pom.xml b/pom.xml
index f801700..d0e96a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,47 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jdeps-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>jdkinternals</goal> <!-- verify main classes -->
+							<goal>test-jdkinternals</goal> <!-- verify test classes -->
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>1.4.1</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<rules>
+						<requireMavenVersion>
+							<version>(3.0,)</version>
+						</requireMavenVersion>
+						<!-- jdk9 check
+						<banDuplicateClasses></banDuplicateClasses>
+						 -->
+					</rules>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 	<profiles>
 		<profile>