diff --git a/core/plugins/org.eclipse.hawk.bpmn/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.bpmn/META-INF/MANIFEST.MF
index f2423fb..929a484 100644
--- a/core/plugins/org.eclipse.hawk.bpmn/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.bpmn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk BPMN Plugin
 Bundle-SymbolicName: org.eclipse.hawk.bpmn;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi,
diff --git a/core/plugins/org.eclipse.hawk.core.dependencies/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.core.dependencies/META-INF/MANIFEST.MF
index a156dea..7198795 100644
--- a/core/plugins/org.eclipse.hawk.core.dependencies/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.core.dependencies/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Core Dependencies Plugin
 Bundle-SymbolicName: org.eclipse.hawk.core.dependencies;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: xstream-1.4.8.jar,
  commons-codec-1.10.jar,
  .
diff --git a/core/plugins/org.eclipse.hawk.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.core/META-INF/MANIFEST.MF
index c598977..6d5ec0a 100644
--- a/core/plugins/org.eclipse.hawk.core/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Core Plugin
 Bundle-SymbolicName: org.eclipse.hawk.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Export-Package: org.eclipse.hawk.core,
  org.eclipse.hawk.core.graph,
  org.eclipse.hawk.core.graph.timeaware,
diff --git a/core/plugins/org.eclipse.hawk.core/pom-plain.xml b/core/plugins/org.eclipse.hawk.core/pom-plain.xml
index 39c874f..9ce2d6d 100644
--- a/core/plugins/org.eclipse.hawk.core/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.core/pom-plain.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.emf/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.emf/META-INF/MANIFEST.MF
index e5f7537..bfb58c0 100644
--- a/core/plugins/org.eclipse.hawk.emf/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Emf Plugin
 Bundle-SymbolicName: org.eclipse.hawk.emf;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi,
diff --git a/core/plugins/org.eclipse.hawk.emf/pom-plain.xml b/core/plugins/org.eclipse.hawk.emf/pom-plain.xml
index a487fb5..84a6d6a 100644
--- a/core/plugins/org.eclipse.hawk.emf/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.emf/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.emfresource/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.emfresource/META-INF/MANIFEST.MF
index de77782..99957a6 100644
--- a/core/plugins/org.eclipse.hawk.emfresource/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.emfresource/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Local Hawk EMF resource
 Bundle-SymbolicName: org.eclipse.hawk.emfresource
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: net.sf.cglib.asm,
diff --git a/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml b/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
index 0bdb72d..2d5f4f5 100644
--- a/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.emfresource/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.epsilon/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.epsilon/META-INF/MANIFEST.MF
index 09bbabc..eaf94fe 100644
--- a/core/plugins/org.eclipse.hawk.epsilon/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.epsilon/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Epsilon Plugin
 Bundle-SymbolicName: org.eclipse.hawk.epsilon;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.hawk.graph,
diff --git a/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml b/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
index d1cb7d6..8d49f27 100644
--- a/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.epsilon/pom-plain.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.graph/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.graph/META-INF/MANIFEST.MF
index cd51b27..9684e27 100644
--- a/core/plugins/org.eclipse.hawk.graph/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.graph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Graph Plugin
 Bundle-SymbolicName: org.eclipse.hawk.graph;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.hawk.core,
  org.slf4j.api;bundle-version="1.7.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/plugins/org.eclipse.hawk.graph/pom-plain.xml b/core/plugins/org.eclipse.hawk.graph/pom-plain.xml
index f614759..7695c22 100644
--- a/core/plugins/org.eclipse.hawk.graph/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.graph/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
index b8a03f6..fd5d7ee 100644
--- a/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.http/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk HTTP File Plugin
 Bundle-SymbolicName: org.eclipse.hawk.http;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core,
diff --git a/core/plugins/org.eclipse.hawk.http/pom-plain.xml b/core/plugins/org.eclipse.hawk.http/pom-plain.xml
index 153135d..9b408a6 100644
--- a/core/plugins/org.eclipse.hawk.http/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.http/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.jgit/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.jgit/META-INF/MANIFEST.MF
index 10d6b98..ddd2c1b 100644
--- a/core/plugins/org.eclipse.hawk.jgit/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.jgit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk JGit Plugin
 Bundle-SymbolicName: org.eclipse.hawk.jgit;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.hawk.core,
  org.slf4j.api;bundle-version="1.7.2",
diff --git a/core/plugins/org.eclipse.hawk.jgit/pom-plain.xml b/core/plugins/org.eclipse.hawk.jgit/pom-plain.xml
index 77925dc..4b03c02 100644
--- a/core/plugins/org.eclipse.hawk.jgit/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.jgit/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.localfolder/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.localfolder/META-INF/MANIFEST.MF
index bd791b8..5490611 100644
--- a/core/plugins/org.eclipse.hawk.localfolder/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.localfolder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Localfolder Plugin
 Bundle-SymbolicName: org.eclipse.hawk.localfolder;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.hawk.core
diff --git a/core/plugins/org.eclipse.hawk.localfolder/pom-plain.xml b/core/plugins/org.eclipse.hawk.localfolder/pom-plain.xml
index 31c2ea1..fb9d947 100644
--- a/core/plugins/org.eclipse.hawk.localfolder/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.localfolder/pom-plain.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.localfolder/pom.xml b/core/plugins/org.eclipse.hawk.localfolder/pom.xml
index 51bdeb3..421f530 100644
--- a/core/plugins/org.eclipse.hawk.localfolder/pom.xml
+++ b/core/plugins/org.eclipse.hawk.localfolder/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.plugins</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.modelio.exml/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.modelio.exml/META-INF/MANIFEST.MF
index b4535c6..401f148 100644
--- a/core/plugins/org.eclipse.hawk.modelio.exml/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.modelio.exml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Modelio parser (.exml based)
 Bundle-SymbolicName: org.eclipse.hawk.modelio.exml;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
diff --git a/core/plugins/org.eclipse.hawk.modelio.exml/pom-plain.xml b/core/plugins/org.eclipse.hawk.modelio.exml/pom-plain.xml
index 037323c..b6a5622 100644
--- a/core/plugins/org.eclipse.hawk.modelio.exml/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.modelio.exml/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.orientdb/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.orientdb/META-INF/MANIFEST.MF
index 1764914..1a9aabf 100644
--- a/core/plugins/org.eclipse.hawk.orientdb/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.orientdb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk OrientDB Backend
 Bundle-SymbolicName: org.eclipse.hawk.orientdb;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core,
diff --git a/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml b/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
index eb6f41d..6568864 100644
--- a/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.orientdb/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.orientdb/pom.xml b/core/plugins/org.eclipse.hawk.orientdb/pom.xml
index 5e75eb2..7629ebc 100644
--- a/core/plugins/org.eclipse.hawk.orientdb/pom.xml
+++ b/core/plugins/org.eclipse.hawk.orientdb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.plugins</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.osgiserver/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.osgiserver/META-INF/MANIFEST.MF
index 480da9b..424f9c7 100644
--- a/core/plugins/org.eclipse.hawk.osgiserver/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.osgiserver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Server Plugin
 Bundle-SymbolicName: org.eclipse.hawk.osgiserver;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.equinox.security,
  org.eclipse.core.runtime
diff --git a/core/plugins/org.eclipse.hawk.svn/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.svn/META-INF/MANIFEST.MF
index e9eca7b..02388e5 100644
--- a/core/plugins/org.eclipse.hawk.svn/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.svn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Svn Plugin
 Bundle-SymbolicName: org.eclipse.hawk.svn;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.hawk.core,
  org.tmatesoft.svnkit;bundle-version="1.8.6";visibility:=reexport,
  org.tmatesoft.sqljet;bundle-version="1.1.10";visibility:=reexport
diff --git a/core/plugins/org.eclipse.hawk.svn/pom-plain.xml b/core/plugins/org.eclipse.hawk.svn/pom-plain.xml
index fde7f37..82bdf65 100644
--- a/core/plugins/org.eclipse.hawk.svn/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.svn/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.timeaware/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.timeaware/META-INF/MANIFEST.MF
index 0b98306..d09a37e 100644
--- a/core/plugins/org.eclipse.hawk.timeaware/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.timeaware/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Time-aware Graph Updater for Hawk
 Bundle-SymbolicName: org.eclipse.hawk.timeaware;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.slf4j.api;bundle-version="1.7.2",
diff --git a/core/plugins/org.eclipse.hawk.timeaware/pom-plain.xml b/core/plugins/org.eclipse.hawk.timeaware/pom-plain.xml
index aa1584c..0f765bc 100644
--- a/core/plugins/org.eclipse.hawk.timeaware/pom-plain.xml
+++ b/core/plugins/org.eclipse.hawk.timeaware/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/core/plugins/org.eclipse.hawk.ui.emc.dt2/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.emc.dt2/META-INF/MANIFEST.MF
index 6cb32ef..3c008b6 100644
--- a/core/plugins/org.eclipse.hawk.ui.emc.dt2/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.emc.dt2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk EMC Development Tools Plugin
 Bundle-SymbolicName: org.eclipse.hawk.ui.emc.dt2;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.epsilon.common.dt,
  org.eclipse.hawk.core,
  org.eclipse.hawk.epsilon,
diff --git a/core/plugins/org.eclipse.hawk.ui.emf/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.emf/META-INF/MANIFEST.MF
index 585f262..05a03bf 100644
--- a/core/plugins/org.eclipse.hawk.ui.emf/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF components for Hawk GUI
 Bundle-SymbolicName: org.eclipse.hawk.ui.emf;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.ui.emf
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/plugins/org.eclipse.hawk.ui.emfresource/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.emfresource/META-INF/MANIFEST.MF
index 26d66f6..45e9662 100644
--- a/core/plugins/org.eclipse.hawk.ui.emfresource/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.emfresource/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse UI for Local Hawk EMF Driver
 Bundle-SymbolicName: org.eclipse.hawk.ui.emfresource;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.ui.emfresource.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/core/plugins/org.eclipse.hawk.ui.localfolder/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.localfolder/META-INF/MANIFEST.MF
index c118a85..eed76db 100644
--- a/core/plugins/org.eclipse.hawk.ui.localfolder/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.localfolder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Local Folder UI components
 Bundle-SymbolicName: org.eclipse.hawk.ui.localfolder;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.ui.localfolder
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/plugins/org.eclipse.hawk.ui.uml/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.uml/META-INF/MANIFEST.MF
index 2084ebf..e41d99d 100644
--- a/core/plugins/org.eclipse.hawk.ui.uml/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk UML UI Components
 Bundle-SymbolicName: org.eclipse.hawk.ui.uml;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.ui.uml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/plugins/org.eclipse.hawk.ui.workspace/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui.workspace/META-INF/MANIFEST.MF
index b528ab8..74ce0aa 100644
--- a/core/plugins/org.eclipse.hawk.ui.workspace/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui.workspace/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Workspace UI components
 Bundle-SymbolicName: org.eclipse.hawk.ui.workspace;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.ui.workspace
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/plugins/org.eclipse.hawk.ui2/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.ui2/META-INF/MANIFEST.MF
index 413e7d0..20cfba3 100644
--- a/core/plugins/org.eclipse.hawk.ui2/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.ui2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk UI Plugin
 Bundle-SymbolicName: org.eclipse.hawk.ui2;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.ui2.Activator
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.hawk.osgiserver,
diff --git a/core/plugins/org.eclipse.hawk.uml/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.uml/META-INF/MANIFEST.MF
index e1f0d1d..cfce4bb 100644
--- a/core/plugins/org.eclipse.hawk.uml/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk UML Plugin
 Bundle-SymbolicName: org.eclipse.hawk.uml;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.hawk.core;bundle-version="2.0.0",
diff --git a/core/plugins/org.eclipse.hawk.workspace/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.hawk.workspace/META-INF/MANIFEST.MF
index c8594a1..6d29c9f 100644
--- a/core/plugins/org.eclipse.hawk.workspace/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.hawk.workspace/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Workspace Repository Plugin
 Bundle-SymbolicName: org.eclipse.hawk.workspace;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.core.resources,
diff --git a/core/plugins/pom.xml b/core/plugins/pom.xml
index e1c4999..3cbc5ad 100644
--- a/core/plugins/pom.xml
+++ b/core/plugins/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.eclipse.hawk.tycho</groupId>
         <artifactId>org.eclipse.hawk.core.parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index 14a9a7c..237cb76 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -70,7 +70,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/core/releng/org.eclipse.hawk.bpmn.feature/feature.xml b/core/releng/org.eclipse.hawk.bpmn.feature/feature.xml
index 6021cfd..6177295 100644
--- a/core/releng/org.eclipse.hawk.bpmn.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.bpmn.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.bpmn.feature"
-      label="Hawk BPMN Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.bpmn.feature" label="Hawk BPMN Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       This feature allows Hawk to index models in the Busines Process Modelling Notation.
diff --git a/core/releng/org.eclipse.hawk.core.feature/feature.xml b/core/releng/org.eclipse.hawk.core.feature/feature.xml
index 95041bd..9e01a3f 100644
--- a/core/releng/org.eclipse.hawk.core.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.core.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.core.feature"
-      label="Hawk Core Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.core.feature" label="Hawk Core Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Core Hawk feature with the main API and the graph updater component.
diff --git a/core/releng/org.eclipse.hawk.emf.feature/feature.xml b/core/releng/org.eclipse.hawk.emf.feature/feature.xml
index 4813a51..f69dcd2 100644
--- a/core/releng/org.eclipse.hawk.emf.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.emf.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.emf.feature"
-      label="Hawk EMF Driver Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.emf.feature" label="Hawk EMF Driver Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Allows indexing EMF models using Hawk.
diff --git a/core/releng/org.eclipse.hawk.emfresource.feature/feature.xml b/core/releng/org.eclipse.hawk.emfresource.feature/feature.xml
index 41e852b..dbd1691 100644
--- a/core/releng/org.eclipse.hawk.emfresource.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.emfresource.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.emfresource.feature"
-      label="Hawk Local EMF Resource Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.emfresource.feature" label="Hawk Local EMF Resource Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides the capability to expose a local Hawk index as an EMF resource.
diff --git a/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml b/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
index 8adffc3..0eeb47a 100644
--- a/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.epsilon.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.epsilon.feature"
-      label="Hawk EOL Query Feature"
-      version="2.0.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.
diff --git a/core/releng/org.eclipse.hawk.http.feature/feature.xml b/core/releng/org.eclipse.hawk.http.feature/feature.xml
index a95b1cb..1b0e7d4 100644
--- a/core/releng/org.eclipse.hawk.http.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.http.feature/feature.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.http.feature"
-      label="Hawk HTTP File Feature"
-      version="2.0.0.qualifier">
+<feature id="org.eclipse.hawk.http.feature" label="Hawk HTTP File Feature" version="2.1.0.qualifier">
 
    <description>
       HTTP connector feature for Hawk. Allows Hawk to watch over resources located in arbitrary HTTP(S) web servers.
diff --git a/core/releng/org.eclipse.hawk.localfolder.feature/feature.xml b/core/releng/org.eclipse.hawk.localfolder.feature/feature.xml
index faccf13..7b285d5 100644
--- a/core/releng/org.eclipse.hawk.localfolder.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.localfolder.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.localfolder.feature"
-      label="Hawk Local Folder Connector Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.localfolder.feature" label="Hawk Local Folder Connector Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Allows Hawk to monitor a local folder.
diff --git a/core/releng/org.eclipse.hawk.modelio.exml.feature/feature.xml b/core/releng/org.eclipse.hawk.modelio.exml.feature/feature.xml
index 72bcfab..6602072 100644
--- a/core/releng/org.eclipse.hawk.modelio.exml.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.modelio.exml.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.modelio.exml.feature"
-      label="Hawk Modelio EXML Driver Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.modelio.exml.feature" label="Hawk Modelio EXML Driver Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides an EPL-friendly clean-room implementation of a parser
diff --git a/core/releng/org.eclipse.hawk.orientdb.feature/feature.xml b/core/releng/org.eclipse.hawk.orientdb.feature/feature.xml
index 7c5aa90..bc227bc 100644
--- a/core/releng/org.eclipse.hawk.orientdb.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.orientdb.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.orientdb.feature"
-      label="Hawk OrientDB Backend Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.orientdb.feature" label="Hawk OrientDB Backend Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       OrientDB backend for Hawk.
diff --git a/core/releng/org.eclipse.hawk.osgiserver.feature/feature.xml b/core/releng/org.eclipse.hawk.osgiserver.feature/feature.xml
index e2a51ec..d43f6e6 100644
--- a/core/releng/org.eclipse.hawk.osgiserver.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.osgiserver.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.osgiserver.feature"
-      label="Hawk OSGi-based Server Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.osgiserver.feature" label="Hawk OSGi-based Server Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description url="http://www.example.com/description">
       Feature for an OSGi-based server for Hawk.
diff --git a/core/releng/org.eclipse.hawk.svn.feature/feature.xml b/core/releng/org.eclipse.hawk.svn.feature/feature.xml
index b717a89..5368166 100644
--- a/core/releng/org.eclipse.hawk.svn.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.svn.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.svn.feature"
-      label="Hawk SVN Connector Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.svn.feature" label="Hawk SVN Connector Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Allows Hawk to monitor a SVN repository.
diff --git a/core/releng/org.eclipse.hawk.targetplatform/pom.xml b/core/releng/org.eclipse.hawk.targetplatform/pom.xml
index cfb607c..020d382 100644
--- a/core/releng/org.eclipse.hawk.targetplatform/pom.xml
+++ b/core/releng/org.eclipse.hawk.targetplatform/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/releng/org.eclipse.hawk.timeaware.feature/feature.xml b/core/releng/org.eclipse.hawk.timeaware.feature/feature.xml
index 85b5019..3132bba 100644
--- a/core/releng/org.eclipse.hawk.timeaware.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.timeaware.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.timeaware.feature"
-      label="Time-aware indexing for Hawk"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.timeaware.feature" label="Time-aware indexing for Hawk" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides time-aware indexing capabilities for Hawk, allowing it to turn the entire history of the model into a single temporal graph, and providing a querying engine that has primitives for travelling back and forth in time.
diff --git a/core/releng/org.eclipse.hawk.ui.feature/feature.xml b/core/releng/org.eclipse.hawk.ui.feature/feature.xml
index 5694b26..74c39eb 100644
--- a/core/releng/org.eclipse.hawk.ui.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.ui.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.ui.feature"
-      label="Hawk Eclipse UI Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.ui.feature" label="Hawk Eclipse UI Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description url="http://www.example.com/description">
       Eclipse-based UI for using Hawk.
diff --git a/core/releng/org.eclipse.hawk.uml.feature/feature.xml b/core/releng/org.eclipse.hawk.uml.feature/feature.xml
index 1c2a929..83d15fa 100644
--- a/core/releng/org.eclipse.hawk.uml.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.uml.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.uml.feature"
-      label="UML Feature for Hawk"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.uml.feature" label="UML Feature for Hawk" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       This feature allows Hawk to index EMF UML2 models and register
diff --git a/core/releng/org.eclipse.hawk.updatesite/pom.xml b/core/releng/org.eclipse.hawk.updatesite/pom.xml
index d4e62cc..6e770b3 100644
--- a/core/releng/org.eclipse.hawk.updatesite/pom.xml
+++ b/core/releng/org.eclipse.hawk.updatesite/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/releng/org.eclipse.hawk.workspace.feature/feature.xml b/core/releng/org.eclipse.hawk.workspace.feature/feature.xml
index b86e671..1ac9961 100644
--- a/core/releng/org.eclipse.hawk.workspace.feature/feature.xml
+++ b/core/releng/org.eclipse.hawk.workspace.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.workspace.feature"
-      label="Hawk Workspace Repository Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.workspace.feature" label="Hawk Workspace Repository Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides the ability to index the currently running Eclipse workspace, and react immediately to any changes.
diff --git a/core/releng/pom.xml b/core/releng/pom.xml
index 909782f..5b03ab6 100644
--- a/core/releng/pom.xml
+++ b/core/releng/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.eclipse.hawk.tycho</groupId>
         <artifactId>org.eclipse.hawk.core.parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/core/tests/org.eclipse.hawk.backend.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.backend.tests/META-INF/MANIFEST.MF
index 77230e8..c5f64ee 100644
--- a/core/tests/org.eclipse.hawk.backend.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.backend.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generic tests for all Hawk backends
 Bundle-SymbolicName: org.eclipse.hawk.backend.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/core/tests/org.eclipse.hawk.backend.tests/pom.xml b/core/tests/org.eclipse.hawk.backend.tests/pom.xml
index fe2fdf0..826f61f 100644
--- a/core/tests/org.eclipse.hawk.backend.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.backend.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.hawk.core.tests</artifactId>
 		<groupId>org.eclipse.hawk.tycho</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/core/tests/org.eclipse.hawk.emf.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.emf.tests/META-INF/MANIFEST.MF
index ab64322..9798285 100644
--- a/core/tests/org.eclipse.hawk.emf.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.emf.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk EMF Support Tests
 Bundle-SymbolicName: org.eclipse.hawk.emf.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.emf;bundle-version="2.0.0"
 Automatic-Module-Name: org.eclipse.hawk.emf.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.graph.syncValidationListener/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.graph.syncValidationListener/META-INF/MANIFEST.MF
index 67117aa..bdaf125 100644
--- a/core/tests/org.eclipse.hawk.graph.syncValidationListener/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.graph.syncValidationListener/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SampleListener
 Bundle-SymbolicName: org.eclipse.hawk.graph.syncValidationListener;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.hawk.graph
diff --git a/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
index cc0f8cd..780d741 100644
--- a/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HttpManager Tests
 Bundle-SymbolicName: org.eclipse.hawk.http.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.http;bundle-version="2.0.0"
 Automatic-Module-Name: org.eclipse.hawk.http.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.integration.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.integration.tests/META-INF/MANIFEST.MF
index d7ca330..9b404e0 100644
--- a/core/tests/org.eclipse.hawk.integration.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.integration.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.hawk.integration.tests;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.integration.tests/pom.xml b/core/tests/org.eclipse.hawk.integration.tests/pom.xml
index 04afffd..4ec2688 100644
--- a/core/tests/org.eclipse.hawk.integration.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.integration.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.hawk.core.tests</artifactId>
 		<groupId>org.eclipse.hawk.tycho</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/core/tests/org.eclipse.hawk.integration.tests/resources/models/dupdep/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.integration.tests/resources/models/dupdep/META-INF/MANIFEST.MF
index 73d424e..fee1635 100644
--- a/core/tests/org.eclipse.hawk.integration.tests/resources/models/dupdep/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.integration.tests/resources/models/dupdep/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: PluginWithDuplicateDependency
 Bundle-SymbolicName: PluginWithDuplicateDependency;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle:  EmptyPlugin;bundle-version="1.0.0",
  EmptyPlugin;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
index 65edf8d..d85a326 100644
--- a/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Hawk JGit VCS
 Bundle-SymbolicName: org.eclipse.hawk.jgit.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.jgit;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
index d1e7135..4c3f666 100644
--- a/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Hawk Local Folder VCS
 Bundle-SymbolicName: org.eclipse.hawk.localfolder.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.localfolder;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/core/tests/org.eclipse.hawk.modelio.exml.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.modelio.exml.tests/META-INF/MANIFEST.MF
index efd502a..cf3ccca 100644
--- a/core/tests/org.eclipse.hawk.modelio.exml.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.modelio.exml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Hawk Modelio .exml parser
 Bundle-SymbolicName: org.eclipse.hawk.modelio.exml.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.modelio.exml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse.org
diff --git a/core/tests/org.eclipse.hawk.svn.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.svn.tests/META-INF/MANIFEST.MF
index d0b7d70..94a94be 100644
--- a/core/tests/org.eclipse.hawk.svn.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.svn.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the SVN Connector
 Bundle-SymbolicName: org.eclipse.hawk.svn.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core;bundle-version="2.0.0",
diff --git a/core/tests/org.eclipse.hawk.svn.tests/pom.xml b/core/tests/org.eclipse.hawk.svn.tests/pom.xml
index 4943a6e..f10232d 100644
--- a/core/tests/org.eclipse.hawk.svn.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.svn.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.tests</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
index 01fd75a..6c06140 100644
--- a/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.hawk.timeaware.tests;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml b/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
index f728b20..9c36f2f 100644
--- a/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.hawk.core.tests</artifactId>
     <groupId>org.eclipse.hawk.tycho</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
index e601e0e..0cce28e 100644
--- a/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for UML support
 Bundle-SymbolicName: org.eclipse.hawk.uml.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.uml;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0"
diff --git a/core/tests/org.eclipse.hawk.workspace.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.workspace.tests/META-INF/MANIFEST.MF
index a49fe03..cc7043f 100644
--- a/core/tests/org.eclipse.hawk.workspace.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.workspace.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Workspace Indexing
 Bundle-SymbolicName: org.eclipse.hawk.workspace.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core;bundle-version="2.0.0",
diff --git a/core/tests/pom.xml b/core/tests/pom.xml
index b8d05cd..a6275a7 100644
--- a/core/tests/pom.xml
+++ b/core/tests/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.eclipse.hawk.tycho</groupId>
         <artifactId>org.eclipse.hawk.core.parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
index 61f2300..d92fae6 100644
--- a/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.hawk.examples.docgen;singleton:=true
 Automatic-Module-Name: org.eclipse.hawk.examples.docgen
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/docs/org.eclipse.hawk.graph.sampleListener/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.graph.sampleListener/META-INF/MANIFEST.MF
index 113c2ab..370e0f7 100644
--- a/docs/org.eclipse.hawk.graph.sampleListener/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.graph.sampleListener/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SampleListener
 Bundle-SymbolicName: org.eclipse.hawk.graph.sampleListener;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core
diff --git a/docs/org.eclipse.hawk.manifest.tests/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.manifest.tests/META-INF/MANIFEST.MF
index 43dcf2f..89fd6cd 100644
--- a/docs/org.eclipse.hawk.manifest.tests/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.manifest.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk MANIFEST Driver Tests
 Bundle-SymbolicName: org.eclipse.hawk.manifest.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Fragment-Host: org.eclipse.hawk.manifest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/docs/org.eclipse.hawk.manifest.tests/resources/dupdep/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.manifest.tests/resources/dupdep/META-INF/MANIFEST.MF
index 73d424e..fee1635 100644
--- a/docs/org.eclipse.hawk.manifest.tests/resources/dupdep/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.manifest.tests/resources/dupdep/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: PluginWithDuplicateDependency
 Bundle-SymbolicName: PluginWithDuplicateDependency;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle:  EmptyPlugin;bundle-version="1.0.0",
  EmptyPlugin;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/docs/org.eclipse.hawk.manifest/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.manifest/META-INF/MANIFEST.MF
index 1e14af6..f812e63 100644
--- a/docs/org.eclipse.hawk.manifest/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.manifest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Manifest Plugin
 Bundle-SymbolicName: org.eclipse.hawk.manifest;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.hawk.core,
  org.eclipse.pde.core,
diff --git a/greycat/org.eclipse.hawk.greycat.feature/feature.xml b/greycat/org.eclipse.hawk.greycat.feature/feature.xml
index fd181a3..1b66e74 100644
--- a/greycat/org.eclipse.hawk.greycat.feature/feature.xml
+++ b/greycat/org.eclipse.hawk.greycat.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.greycat.feature"
-      label="Greycat Backend Feature for Hawk"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.greycat.feature" label="Greycat Backend Feature for Hawk" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Backend implementation based on Greycat many-worlds temporal graphs, with custom Lucene indexing.
diff --git a/greycat/org.eclipse.hawk.greycat.tests/META-INF/MANIFEST.MF b/greycat/org.eclipse.hawk.greycat.tests/META-INF/MANIFEST.MF
index 1762b3d..5570d99 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/META-INF/MANIFEST.MF
+++ b/greycat/org.eclipse.hawk.greycat.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Greycat backend
 Bundle-SymbolicName: org.eclipse.hawk.greycat.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.greycat.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/greycat/org.eclipse.hawk.greycat.tests/pom.xml b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
index 2264ad6..f3ac982 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.hawk.greycat.parent</artifactId>
     <groupId>org.eclipse.hawk.tycho</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml b/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
index 1518878..2268d32 100644
--- a/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.greycat.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/greycat/org.eclipse.hawk.greycat/META-INF/MANIFEST.MF b/greycat/org.eclipse.hawk.greycat/META-INF/MANIFEST.MF
index 8c84a6c..43ac793 100644
--- a/greycat/org.eclipse.hawk.greycat/META-INF/MANIFEST.MF
+++ b/greycat/org.eclipse.hawk.greycat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Greycat Backend for Hawk
 Bundle-SymbolicName: org.eclipse.hawk.greycat;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core;bundle-version="2.0.0",
diff --git a/greycat/org.eclipse.hawk.greycat/pom-plain.xml b/greycat/org.eclipse.hawk.greycat/pom-plain.xml
index ad1834f..9727855 100644
--- a/greycat/org.eclipse.hawk.greycat/pom-plain.xml
+++ b/greycat/org.eclipse.hawk.greycat/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/greycat/org.eclipse.hawk.greycat/pom.xml b/greycat/org.eclipse.hawk.greycat/pom.xml
index e692bbf..b2c2465 100644
--- a/greycat/org.eclipse.hawk.greycat/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/greycat/pom.xml b/greycat/pom.xml
index c4dd79f..a3b69cf 100644
--- a/greycat/pom.xml
+++ b/greycat/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/legacy/org.eclipse.hawk.modelio.exml.ecoregen/META-INF/MANIFEST.MF b/legacy/org.eclipse.hawk.modelio.exml.ecoregen/META-INF/MANIFEST.MF
index 3e2a818..4514f2b 100644
--- a/legacy/org.eclipse.hawk.modelio.exml.ecoregen/META-INF/MANIFEST.MF
+++ b/legacy/org.eclipse.hawk.modelio.exml.ecoregen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.hawk.modelio.exml.ecoregen;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/neo4j2/org.eclipse.hawk.neo4j-v2/META-INF/MANIFEST.MF b/neo4j2/org.eclipse.hawk.neo4j-v2/META-INF/MANIFEST.MF
index 40dd13a..549dc8e 100644
--- a/neo4j2/org.eclipse.hawk.neo4j-v2/META-INF/MANIFEST.MF
+++ b/neo4j2/org.eclipse.hawk.neo4j-v2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Neo4j-v2 Plugin
 Bundle-SymbolicName: org.eclipse.hawk.neo4j-v2;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.hawk.core,
  org.slf4j.api;bundle-version="1.7.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/neo4j2/org.eclipse.hawk.neo4j-v2/pom-plain.xml b/neo4j2/org.eclipse.hawk.neo4j-v2/pom-plain.xml
index 004959f..a7aa2cf 100644
--- a/neo4j2/org.eclipse.hawk.neo4j-v2/pom-plain.xml
+++ b/neo4j2/org.eclipse.hawk.neo4j-v2/pom-plain.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.hawk</groupId>
 		<artifactId>mondo-hawk-plain</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../../pom-plain.xml</relativePath>
 	</parent>
 
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.eclipse.hawk</groupId>
 			<artifactId>org.eclipse.hawk.core</artifactId>
-			<version>2.0.0</version>
+			<version>2.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.neo4j</groupId>
diff --git a/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml b/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
index ac6aab1..dd95d57 100644
--- a/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
+++ b/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.hawk.tycho</groupId>
 		<artifactId>org.eclipse.hawk.neo4jv2.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/neo4j2/org.eclipse.hawk.neo4jv2.feature/feature.xml b/neo4j2/org.eclipse.hawk.neo4jv2.feature/feature.xml
index 251ae0f..2afd840 100644
--- a/neo4j2/org.eclipse.hawk.neo4jv2.feature/feature.xml
+++ b/neo4j2/org.eclipse.hawk.neo4jv2.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.neo4jv2.feature"
-      label="Hawk Neo4Jv2 Backend Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.neo4jv2.feature" label="Hawk Neo4Jv2 Backend Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Implements a Neo4Jv2 backend for storing Hawk&apos;s index.
diff --git a/neo4j2/org.eclipse.hawk.neo4jv2.tests/META-INF/MANIFEST.MF b/neo4j2/org.eclipse.hawk.neo4jv2.tests/META-INF/MANIFEST.MF
index a4442f2..44c7cbb 100644
--- a/neo4j2/org.eclipse.hawk.neo4jv2.tests/META-INF/MANIFEST.MF
+++ b/neo4j2/org.eclipse.hawk.neo4jv2.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Neo4j 2.x backend
 Bundle-SymbolicName: org.eclipse.hawk.neo4jv2.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.neo4jv2.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml b/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
index 5c75ed3..ee0e518 100644
--- a/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
+++ b/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.hawk.neo4jv2.parent</artifactId>
     <groupId>org.eclipse.hawk.tycho</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/neo4j2/pom.xml b/neo4j2/pom.xml
index d4d1549..7d07577 100644
--- a/neo4j2/pom.xml
+++ b/neo4j2/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/pom-plain.xml b/pom-plain.xml
index 55d3ddf..a20e2b5 100644
--- a/pom-plain.xml
+++ b/pom-plain.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.hawk</groupId>
   <artifactId>mondo-hawk-plain</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Hawk Parent</name>
diff --git a/pom.xml b/pom.xml
index 758d147..15540be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.hawk.tycho</groupId>
   <artifactId>org.eclipse.hawk.parent</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/server/plugins/org.eclipse.hawk.service.api.dt/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.api.dt/META-INF/MANIFEST.MF
index c4b73a8..0b50e97 100644
--- a/server/plugins/org.eclipse.hawk.service.api.dt/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.api.dt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse UI for Hawk API
 Bundle-SymbolicName: org.eclipse.hawk.service.api.dt;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.service.api.dt.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.ui,
diff --git a/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
index dd82233..f5e7fa4 100644
--- a/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.api/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Server API
 Bundle-SymbolicName: org.eclipse.hawk.service.api
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.apache.thrift;bundle-version="[0.9.3,0.9.3]",
diff --git a/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
index 23aa6fb..042b78d 100644
--- a/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.api/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/server/plugins/org.eclipse.hawk.service.artemis.server/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.artemis.server/META-INF/MANIFEST.MF
index 04589bd..fceeda1 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis.server/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.artemis.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Artemis Server Wrapper
 Bundle-SymbolicName: org.eclipse.hawk.service.artemis.server
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/server/plugins/org.eclipse.hawk.service.artemis/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.artemis/META-INF/MANIFEST.MF
index d698f63..6c88e75 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.artemis/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Artemis Integration for remote notifications -- server side
 Bundle-SymbolicName: org.eclipse.hawk.service.artemis
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.slf4j.api;bundle-version="1.7.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
index 6ff0a26..71f9e2d 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.artemis/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/server/plugins/org.eclipse.hawk.service.artemis/pom.xml b/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
index ff5dcde..9e87564 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
+++ b/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.plugins</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
index 5457123..eaa44fb 100644
--- a/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CLI Hawk Client
 Bundle-SymbolicName: org.eclipse.hawk.service.cli;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.console,
diff --git a/server/plugins/org.eclipse.hawk.service.clients.cli.application/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.clients.cli.application/META-INF/MANIFEST.MF
index b008a6a..4f1a865 100644
--- a/server/plugins/org.eclipse.hawk.service.clients.cli.application/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.clients.cli.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: API Clients -- Command Line App
 Bundle-SymbolicName: org.eclipse.hawk.service.clients.cli.application;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/server/plugins/org.eclipse.hawk.service.emc.dt/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.emc.dt/META-INF/MANIFEST.MF
index 5a80730..5c62552 100644
--- a/server/plugins/org.eclipse.hawk.service.emc.dt/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.emc.dt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMC Driver Developer Tools for remote Hawk EMF Resource
 Bundle-SymbolicName: org.eclipse.hawk.service.emc.dt;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.service.emc.dt.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.ui,
diff --git a/server/plugins/org.eclipse.hawk.service.emc/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.emc/META-INF/MANIFEST.MF
index b25f0dd..16bd185 100644
--- a/server/plugins/org.eclipse.hawk.service.emc/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.emc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMC Driver for remote Hawk EMF resources
 Bundle-SymbolicName: org.eclipse.hawk.service.emc;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.emfresource,
diff --git a/server/plugins/org.eclipse.hawk.service.emf.dt/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.emf.dt/META-INF/MANIFEST.MF
index 2ab22fa..dbdcab4 100644
--- a/server/plugins/org.eclipse.hawk.service.emf.dt/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.emf.dt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Remote Hawk EMF Driver UI
 Bundle-SymbolicName: org.eclipse.hawk.service.emf.dt;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.service.emf.dt.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.ui,
diff --git a/server/plugins/org.eclipse.hawk.service.emf/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.emf/META-INF/MANIFEST.MF
index 2cbb0a0..8da86be 100644
--- a/server/plugins/org.eclipse.hawk.service.emf/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Remote EMF Driver for Hawk
 Bundle-SymbolicName: org.eclipse.hawk.service.emf;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.10.0",
diff --git a/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml b/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
index 8c0a544..9c24e9d 100644
--- a/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
+++ b/server/plugins/org.eclipse.hawk.service.emf/pom-plain.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk</groupId>
     <artifactId>mondo-hawk-plain</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../../pom-plain.xml</relativePath>
   </parent>
 
diff --git a/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
index 0e1ef96..2282701 100644
--- a/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Time-Aware Remote Index Support
 Bundle-SymbolicName: org.eclipse.hawk.service.remote.thrift.timeaware;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.service.remote.thrift.timeaware
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/plugins/org.eclipse.hawk.service.remote.thrift/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.remote.thrift/META-INF/MANIFEST.MF
index e147f70..76e620d 100644
--- a/server/plugins/org.eclipse.hawk.service.remote.thrift/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.remote.thrift/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Thrift integration for Hawk GUI
 Bundle-SymbolicName: org.eclipse.hawk.service.remote.thrift;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.hawk.core,
diff --git a/server/plugins/org.eclipse.hawk.service.server.application/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.application/META-INF/MANIFEST.MF
index 18ad063..f9748e9 100644
--- a/server/plugins/org.eclipse.hawk.service.server.application/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Server Application
 Bundle-SymbolicName: org.eclipse.hawk.service.server.application;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
index 2297469..f9568b0 100644
--- a/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Server specific CLI commands
 Bundle-SymbolicName: org.eclipse.hawk.service.server.cli
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/server/plugins/org.eclipse.hawk.service.server.gzip/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.gzip/META-INF/MANIFEST.MF
index e9d7a90..a135001 100644
--- a/server/plugins/org.eclipse.hawk.service.server.gzip/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.gzip/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Jetty Customizer Fragment
 Bundle-SymbolicName: org.eclipse.hawk.service.server.gzip
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Fragment-Host: org.eclipse.equinox.http.jetty;bundle-version="3.0.200"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/plugins/org.eclipse.hawk.service.server.logback/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.logback/META-INF/MANIFEST.MF
index 74b5830..bfe2b2c 100644
--- a/server/plugins/org.eclipse.hawk.service.server.logback/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.logback/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Server -- Logback Configuration
 Bundle-SymbolicName: org.eclipse.hawk.service.server.logback
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Fragment-Host: ch.qos.logback.classic;bundle-version="1.0.7.v20121108-1250"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/plugins/org.eclipse.hawk.service.server.productdefs/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.productdefs/META-INF/MANIFEST.MF
index 4b132b3..b19ea34 100644
--- a/server/plugins/org.eclipse.hawk.service.server.productdefs/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.productdefs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Integration - Server Product Definitions
 Bundle-SymbolicName: org.eclipse.hawk.service.server.productdefs;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime
 Bundle-Vendor: Eclipse.org
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
index 949e0c2..e24ad0a 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: User Management - CLI client
 Bundle-SymbolicName: org.eclipse.hawk.service.server.users.cli
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
index b4909cf..0d6eb6a 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: User Management Servlet
 Bundle-SymbolicName: org.eclipse.hawk.service.server.users.servlet;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.service.server.users.servlet.UsersPlugin
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml b/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
index ed4806a..23fa307 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
+++ b/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.plugins</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/plugins/org.eclipse.hawk.service.servlet/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.servlet/META-INF/MANIFEST.MF
index fea295e..9070d77 100644
--- a/server/plugins/org.eclipse.hawk.service.servlet/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.servlet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Servlet
 Bundle-SymbolicName: org.eclipse.hawk.service.servlet;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.hawk.service.servlet.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index 33bbbd9..08ca30a 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/pom.xml b/server/pom.xml
index 32e1c13..aae0561 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -53,7 +53,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.api.dt.feature/feature.xml b/server/releng/org.eclipse.hawk.service.api.dt.feature/feature.xml
index 2a58b68..f8558c6 100644
--- a/server/releng/org.eclipse.hawk.service.api.dt.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.api.dt.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.api.dt.feature"
-      label="Hawk Service API Developer Tools Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.api.dt.feature" label="Hawk Service API Developer Tools Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides developer tools to work with the Hawk server APIs. This includes a preferences page to specify our credentials to communicate with the Hawk server.
diff --git a/server/releng/org.eclipse.hawk.service.api.feature/feature.xml b/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
index cf9245f..b7757c9 100644
--- a/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.api.feature/feature.xml
@@ -1,260 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.api.feature"
-      label="Hawk API Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description>
-      This feature provides the Hawk web services API and the basic integration with Apache Artemis, the SLF4J logging framework and Apache HttpClient.
-   </description>
-
-   <copyright>
-      (c) Copyright Eclipse Hawk contributors and others 2011, 2020.
-All rights reserved. Visit https://www.eclipse.org/hawk/
-   </copyright>
-
-   <license url="https://www.eclipse.org/legal/epl-2.0/">
-      Eclipse Foundation Software User Agreement
-
-November 22, 2017
-
-Usage Of Content
-
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
-Unless otherwise indicated, all Content made available by the Eclipse Foundation
-is provided to you under the terms and conditions of the Eclipse Public License
-Version 2.0 (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also
-available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
-&quot;Program&quot; will mean the Content.
-
-Content includes, but is not limited to, source code, object code, documentation
-and other files maintained in the Eclipse Foundation source code repository
-(&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as
-downloadable archives (&quot;Downloads&quot;).
-
--   Content may be structured and packaged into modules to facilitate
-    delivering, extending, and upgrading the Content. Typical modules may
-    include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and
-    features (&quot;Features&quot;).
--   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
-    (Java\u2122 ARchive) in a directory named &quot;plugins&quot;.
--   A Feature is a bundle of one or more Plug-ins and/or Fragments and
-    associated material. Each Feature may be packaged as a sub-directory in a
-    directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may
-    contain a list of the names and version numbers of the Plug-ins and/or
-    Fragments associated with that Feature.
--   Features may also include other Features (&quot;Included Features&quot;). Within a
-    Feature, files named &quot;feature.xml&quot; may contain a list of the names and
-    version numbers of Included Features.
-
-The terms and conditions governing Plug-ins and Fragments should be contained in
-files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features
-and Included Features should be contained in files named &quot;license.html&quot;
-(&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:
-
--   The top-level (root) directory
--   Plug-in and Fragment directories
--   Inside Plug-ins and Fragments packaged as JARs
--   Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
--   Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using
-the Provisioning Technology (as defined below), you must agree to a license
-(&quot;Feature Update License&quot;) during the installation process. If the Feature
-contains Included Features, the Feature Update License should either provide you
-with the terms and conditions governing the Included Features or inform you
-where you can locate them. Feature Update Licenses may be found in the &quot;license&quot;
-property of files named &quot;feature.properties&quot; found within a Feature. Such
-Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
-conditions (or references to such terms and conditions) that govern your use of
-the associated Content in that directory.
-
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
-
--   Eclipse Public License Version 1.0 (available at
-    http://www.eclipse.org/legal/epl-v10.html)
--   Eclipse Distribution License Version 1.0 (available at
-    http://www.eclipse.org/licenses/edl-v1.0.html)
--   Common Public License Version 1.0 (available at
-    http://www.eclipse.org/legal/cpl-v10.html)
--   Apache Software License 1.1 (available at
-    http://www.apache.org/licenses/LICENSE)
--   Apache Software License 2.0 (available at
-    http://www.apache.org/licenses/LICENSE-2.0)
--   Mozilla Public License Version 1.1 (available at
-    http://www.mozilla.org/MPL/MPL-1.1.html)
-
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
-USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.
-
-Use of Provisioning Technology
-
-The Eclipse Foundation makes available provisioning software, examples of which
-include, but are not limited to, p2 and the Eclipse Update Manager
-(&quot;Provisioning Technology&quot;) for the purpose of allowing users to install
-software, documentation, information and/or other materials (collectively
-&quot;Installable Software&quot;). This capability is provided with the intent of allowing
-such users to install, extend and update Eclipse-based products. Information
-about packaging Installable Software is available at
-http://eclipse.org/equinox/p2/repository_packaging.html (&quot;Specification&quot;).
-
-You may use Provisioning Technology to allow other parties to install
-Installable Software. You shall be responsible for enabling the applicable
-license agreements relating to the Installable Software to be presented to, and
-accepted by, the users of the Provisioning Technology in accordance with the
-Specification. By using Provisioning Technology in such a manner and making it
-available in accordance with the Specification, you further acknowledge your
-agreement to, and the acquisition of all necessary rights to permit the
-following:
-
-1.  A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may
-    execute the Provisioning Technology on a machine (&quot;Target Machine&quot;) with the
-    intent of installing, extending or updating the functionality of an
-    Eclipse-based product.
-2.  During the Provisioning Process, the Provisioning Technology may cause third
-    party Installable Software or a portion thereof to be accessed and copied to
-    the Target Machine.
-3.  Pursuant to the Specification, you will provide to the user the terms and
-    conditions that govern the use of the Installable Software (&quot;Installable
-    Software Agreement&quot;) and such Installable Software Agreement shall be
-    accessed from the Target Machine in accordance with the Specification. Such
-    Installable Software Agreement must inform the user of the terms and
-    conditions that govern the Installable Software and must solicit acceptance
-    by the end user in the manner prescribed in such Installable
-    Software Agreement. Upon such indication of agreement by the user, the
-    provisioning Technology will complete installation of the
-    Installable Software.
-
-Cryptography
-
-Content may contain encryption software. The country in which you are currently
-may have restrictions on the import, possession, and use, and/or re-export to
-another country, of encryption software. BEFORE using any encryption software,
-please check the country&apos;s laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this is
-permitted.
-
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the
-United States, other countries, or both.
-   </license>
-
-   <requires>
-      <import plugin="org.slf4j.api" version="1.7.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.apache.thrift" version="0.9.3" match="perfect"/>
-      <import plugin="org.eclipse.hawk.service.artemis" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.apache.thrift"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpcore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.hawk.service.artemis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.beanutils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.collections"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpcore-nio"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.guava"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.hawk.service.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="org.eclipse.hawk.service.api.feature" label="Hawk API Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
+
+   <description>
+      This feature provides the Hawk web services API and the basic integration with Apache Artemis, the SLF4J logging framework and Apache HttpClient.
+   </description>
+
+   <copyright>
+      (c) Copyright Eclipse Hawk contributors and others 2011, 2020.
+All rights reserved. Visit https://www.eclipse.org/hawk/
+   </copyright>
+
+   <license url="https://www.eclipse.org/legal/epl-2.0/">
+      Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java\u2122 ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
+   </license>
+
+   <requires>
+      <import plugin="org.slf4j.api" version="1.7.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="org.apache.thrift" version="0.9.3" match="perfect"/>
+      <import plugin="org.eclipse.hawk.service.artemis" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin id="org.apache.thrift" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.httpcomponents.httpclient" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.httpcomponents.httpcore" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.eclipse.hawk.service.artemis" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.commons.codec" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.commons.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.slf4j.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="javax.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.commons.beanutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.commons.collections" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.apache.httpcomponents.httpcore-nio" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="com.google.guava" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.eclipse.hawk.service.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
diff --git a/server/releng/org.eclipse.hawk.service.api.feature/pom.xml b/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
index 5606708..10ac6f0 100644
--- a/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.cli.feature/feature.xml b/server/releng/org.eclipse.hawk.service.cli.feature/feature.xml
index 5ed66bb..a09cc95 100644
--- a/server/releng/org.eclipse.hawk.service.cli.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.cli.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.cli.feature"
-      label="Hawk CLI Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.cli.feature" label="Hawk CLI Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides OSGi console commands for communicating with a remote Hawk index.
diff --git a/server/releng/org.eclipse.hawk.service.cli.product/META-INF/MANIFEST.MF b/server/releng/org.eclipse.hawk.service.cli.product/META-INF/MANIFEST.MF
index 2eee268..a91eae9 100644
--- a/server/releng/org.eclipse.hawk.service.cli.product/META-INF/MANIFEST.MF
+++ b/server/releng/org.eclipse.hawk.service.cli.product/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk CLI Product
 Bundle-SymbolicName: org.eclipse.hawk.service.cli.product;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.hawk.service.clients.cli.application;bundle-version="1.0.0"
diff --git a/server/releng/org.eclipse.hawk.service.cli.product/org.eclipse.hawk.service.cli.product b/server/releng/org.eclipse.hawk.service.cli.product/org.eclipse.hawk.service.cli.product
index 6ec1fb0..5a541e6 100644
--- a/server/releng/org.eclipse.hawk.service.cli.product/org.eclipse.hawk.service.cli.product
+++ b/server/releng/org.eclipse.hawk.service.cli.product/org.eclipse.hawk.service.cli.product
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-
-<product name="Hawk CLI Client Product" uid="org.eclipse.hawk.service.cli.product" id="org.eclipse.hawk.service.cli.product.product" application="org.eclipse.hawk.service.clients.cli.application.app" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Hawk CLI Client Product" uid="org.eclipse.hawk.service.cli.product" id="org.eclipse.hawk.service.cli.product.product" application="org.eclipse.hawk.service.clients.cli.application.app" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
index ac6f3fe..0181592 100644
--- a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.hawk.tycho</groupId>
 		<artifactId>org.eclipse.hawk.server.releng</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
index 84d81b8..ced0407 100644
--- a/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.clients.cli.feature/feature.xml b/server/releng/org.eclipse.hawk.service.clients.cli.feature/feature.xml
index 1fe5e12..17f1e86 100644
--- a/server/releng/org.eclipse.hawk.service.clients.cli.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.clients.cli.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.clients.cli.feature"
-      label="Hawk CLI Client Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.clients.cli.feature" label="Hawk CLI Client Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides a console-based Eclipse product to communicate with a remote Hawk index through its Thrift web services.
diff --git a/server/releng/org.eclipse.hawk.service.emf.dt.feature/feature.xml b/server/releng/org.eclipse.hawk.service.emf.dt.feature/feature.xml
index c4819b9..0880d30 100644
--- a/server/releng/org.eclipse.hawk.service.emf.dt.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.emf.dt.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.emf.dt.feature"
-      label="Remote Hawk EMF Model UI Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.emf.dt.feature" label="Remote Hawk EMF Model UI Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides developer tools for managing Hawk remote model descriptors.
diff --git a/server/releng/org.eclipse.hawk.service.emf.feature/feature.xml b/server/releng/org.eclipse.hawk.service.emf.feature/feature.xml
index 4575035..b315b3b 100644
--- a/server/releng/org.eclipse.hawk.service.emf.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.emf.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.emf.feature"
-      label="Remote Hawk EMF Driver Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.emf.feature" label="Remote Hawk EMF Driver Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides the capability to expose remote Hawk indices as EMF models. For the model descriptor editor, please install the Developer Tools feature as well.
diff --git a/server/releng/org.eclipse.hawk.service.remote.thrift.feature/feature.xml b/server/releng/org.eclipse.hawk.service.remote.thrift.feature/feature.xml
index c862761..71dafe9 100644
--- a/server/releng/org.eclipse.hawk.service.remote.thrift.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.remote.thrift.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.remote.thrift.feature"
-      label="Thrift API integration for Hawk GUI Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.remote.thrift.feature" label="Thrift API integration for Hawk GUI Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Provides the ability to use a remote Hawk index in the Hawk Eclipse GUI.
diff --git a/server/releng/org.eclipse.hawk.service.remote.thrift.timeaware.feature/feature.xml b/server/releng/org.eclipse.hawk.service.remote.thrift.timeaware.feature/feature.xml
index d2f094e..fd23471 100644
--- a/server/releng/org.eclipse.hawk.service.remote.thrift.timeaware.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.remote.thrift.timeaware.feature/feature.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.remote.thrift.timeaware.feature"
-      label="Remote Time-Aware Indexes Feature"
-      version="2.0.0.qualifier">
+<feature id="org.eclipse.hawk.service.remote.thrift.timeaware.feature" label="Remote Time-Aware Indexes Feature" version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       Provides the ability to use a remote time-aware Hawk
diff --git a/server/releng/org.eclipse.hawk.service.server.feature/feature.xml b/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
index cffc5a0..11dd6c7 100644
--- a/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.server.feature"
-      label="Hawk Integration - Server Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.server.feature" label="Hawk Integration - Server Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       This feature brings together the basic components needed for the Hawk server. The Hawk servlets are not included here.
diff --git a/server/releng/org.eclipse.hawk.service.server.feature/pom.xml b/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
index 7a3d1d5..e56fade 100644
--- a/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.server.product/META-INF/MANIFEST.MF b/server/releng/org.eclipse.hawk.service.server.product/META-INF/MANIFEST.MF
index e03d465..ca2c303 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/META-INF/MANIFEST.MF
+++ b/server/releng/org.eclipse.hawk.service.server.product/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Integration - Server Products
 Bundle-SymbolicName: org.eclipse.hawk.service.server.product;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Eclipse.org
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 b012d7b..e60e8d9 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,7 +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.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<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">
    </configIni>
diff --git a/server/releng/org.eclipse.hawk.service.server.product/pom.xml b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
index 6ab02fd..366f0f0 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   
diff --git a/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
index da23fed..ac96836 100644
--- a/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.server.users.cli.feature/feature.xml b/server/releng/org.eclipse.hawk.service.server.users.cli.feature/feature.xml
index 6adf972..f36ec4f 100644
--- a/server/releng/org.eclipse.hawk.service.server.users.cli.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.server.users.cli.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.server.users.cli.feature"
-      label="Hawk User Management CLI Client Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.server.users.cli.feature" label="Hawk User Management CLI Client Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       Console commands for user management within the Hawk server.
diff --git a/server/releng/org.eclipse.hawk.service.servlet.feature/feature.xml b/server/releng/org.eclipse.hawk.service.servlet.feature/feature.xml
index 350185f..a1dc473 100644
--- a/server/releng/org.eclipse.hawk.service.servlet.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.servlet.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.hawk.service.servlet.feature"
-      label="Hawk Integration - Hawk Servlet Feature"
-      version="2.0.0.qualifier"
-      provider-name="Eclipse.org">
+<feature id="org.eclipse.hawk.service.servlet.feature" label="Hawk Integration - Hawk Servlet Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
 
    <description>
       This feature provides servlets implementing the Hawk web services, which are automatically added to the OSGi HttpService registry.
diff --git a/server/releng/pom.xml b/server/releng/pom.xml
index 4a89fb7..bbe13dd 100644
--- a/server/releng/pom.xml
+++ b/server/releng/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.eclipse.hawk.tycho</groupId>
         <artifactId>org.eclipse.hawk.server.parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/server/tests/org.eclipse.hawk.service.emf.tests/META-INF/MANIFEST.MF b/server/tests/org.eclipse.hawk.service.emf.tests/META-INF/MANIFEST.MF
index fab1361..c97f074 100644
--- a/server/tests/org.eclipse.hawk.service.emf.tests/META-INF/MANIFEST.MF
+++ b/server/tests/org.eclipse.hawk.service.emf.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Remote Hawk EMF Driver
 Bundle-SymbolicName: org.eclipse.hawk.service.emf.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.service.emf;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.0.0"
diff --git a/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF b/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
index a6c2d25..2d2afe7 100644
--- a/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
+++ b/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.hawk.service.servlet.tests
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Fragment-Host: org.eclipse.hawk.service.servlet;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/server/tests/pom.xml b/server/tests/pom.xml
index 274fa3d..062f246 100644
--- a/server/tests/pom.xml
+++ b/server/tests/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>