diff --git a/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml b/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
index 0eeb47a..ed9a0f9 100644
--- a/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.hawk.epsilon.feature" label="Hawk EOL Query Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
+<feature
+      id="org.eclipse.hawk.epsilon.feature"
+      label="Hawk EOL Query Feature"
+      version="2.1.0.qualifier"
+      provider-name="Eclipse.org">
 
    <description url="http://www.example.com/description">
       Allows querying a Hawk index using the Epsilon Object Language.
@@ -168,4 +172,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.antlr.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product b/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
index e60e8d9..94c0972 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
+++ b/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
+
 <product name="Server Product" uid="org.eclipse.hawk.service.server.product.nogplserver" id="org.eclipse.hawk.service.server.product.nogplserver" application="org.eclipse.hawk.service.server.application.serverapp" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
@@ -86,6 +87,7 @@
       <feature id="org.eclipse.emf.mapping"/>
       <feature id="org.eclipse.hawk.greycat.feature"/>
       <feature id="org.eclipse.hawk.timeaware.feature"/>
+      <feature id="org.eclipse.equinox.core.feature" installMode="root"/>
    </features>
 
    <configurations>