diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
index 01fed21..e8dd5a4 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Live Validation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries.validation;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.queries,
+Require-Bundle: org.eclipse.viatra.examples.cps.queries;bundle-version="[2.9.0,3.0.0)", 
  com.google.guava,
- org.eclipse.viatra.examples.cps.model,
- org.eclipse.viatra.examples.cps.traceability,
- org.eclipse.viatra.examples.cps.deployment,
- org.eclipse.viatra.query.runtime,
- org.eclipse.viatra.addon.validation.core,
- org.eclipse.viatra.addon.validation.runtime
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.addon.validation.core;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.addon.validation.runtime;bundle-version="[2.9.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.queries.validation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/plugin.xml b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/plugin.xml
index c760d4e..f496277 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/plugin.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/plugin.xml
@@ -1 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?><plugin/>
+<?xml version="1.0" encoding="UTF-8"?><plugin>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalCpu" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.AvailableGreaterThanTotalCpuConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalCpu"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalHdd" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.AvailableGreaterThanTotalHddConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalHdd"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalRam" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.AvailableGreaterThanTotalRamConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.availableGreaterThanTotalRam"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.idContainsWhitespace" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.IdContainsWhitespaceConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.idContainsWhitespace"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.idIsNotUnique" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.IdIsNotUniqueConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.idIsNotUnique"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.initialStateNotContainedByStateMachine" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.InitialStateNotContainedByStateMachineConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.initialStateNotContainedByStateMachine"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.multipleApplicationInstanceInCommunicationGroup" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.MultipleApplicationInstanceInCommunicationGroupConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.multipleApplicationInstanceInCommunicationGroup"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.multipleTransitionsWithSameAction" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.MultipleTransitionsWithSameActionConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.multipleTransitionsWithSameAction"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.nodeIpIsNotUnique" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.NodeIpIsNotUniqueConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.nodeIpIsNotUnique"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.notAllocatedButRunning" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.NotAllocatedButRunningConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.notAllocatedButRunning"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.targetStateNotContainedBySameStateMachine" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.TargetStateNotContainedBySameStateMachineConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.targetStateNotContainedBySameStateMachine"/>
+  </extension>
+  <extension id="validation.constraint.org.eclipse.viatra.examples.cps.model.validation.transitionWithoutTargetState" point="org.eclipse.viatra.addon.validation.runtime.constraint">
+    <constraint class="org.eclipse.viatra.examples.cps.model.validation.TransitionWithoutTargetStateConstraint0" name="org.eclipse.viatra.examples.cps.model.validation.transitionWithoutTargetState"/>
+  </extension>
+</plugin>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
index a00948c..8a67119 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.queries.validation</artifactId>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
index 8c88287..6e61911 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
@@ -2,22 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Viewers
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.view;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.model,
+Require-Bundle: org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.integration.zest;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gef.layout;bundle-version="5.0.0",
- org.eclipse.gef.zest.fx;bundle-version="5.0.0",
- org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
- org.eclipse.gef.mvc.fx;bundle-version="5.0.0",
- org.eclipse.viatra.examples.cps.model.editor,
- org.eclipse.viatra.examples.cps.queries,
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.integration.zest;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.model.editor;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.queries;bundle-version="[2.9.0,3.0.0)",
  com.google.guava;bundle-version="10.0.0",
- org.eclipse.viatra.addon.viewers.runtime;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.viatra.addon.viewers.runtime;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.zest.core,
+ org.eclipse.zest.layouts
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j;version="1.2.15"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.view
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
index a6223d3..cde0e28 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.view</artifactId>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/src/org/eclipse/viatra/examples/cps/view/AbstractCpsViewPart.java b/cps/addons/org.eclipse.viatra.examples.cps.view/src/org/eclipse/viatra/examples/cps/view/AbstractCpsViewPart.java
index 2e02bfd..63b8fd0 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/src/org/eclipse/viatra/examples/cps/view/AbstractCpsViewPart.java
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/src/org/eclipse/viatra/examples/cps/view/AbstractCpsViewPart.java
@@ -12,8 +12,6 @@
 import java.util.Objects;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.gef.layout.ILayoutAlgorithm;
-import org.eclipse.gef.layout.algorithms.SpaceTreeLayoutAlgorithm;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
@@ -28,18 +26,20 @@
 import org.eclipse.viatra.addon.viewers.runtime.model.ViewerState.ViewerStateFeature;
 import org.eclipse.viatra.addon.viewers.runtime.zest.ViatraGraphViewers;
 import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.presentation.CyberPhysicalSystemEditor;
-import org.eclipse.viatra.integration.zest.viewer.ModifiableZestContentViewer;
+import org.eclipse.viatra.integration.zest.viewer.ViatraGraphViewer;
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.emf.EMFScope;
 import org.eclipse.viatra.query.runtime.matchers.ViatraQueryRuntimeException;
+import org.eclipse.zest.layouts.LayoutAlgorithm;
+import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
 
 import com.google.common.collect.ImmutableSet;
 
 
 public abstract class AbstractCpsViewPart extends ViewPart implements IPartListener2 {
 
-		private ModifiableZestContentViewer viewer;
+		private ViatraGraphViewer viewer;
 		private ViatraQueryEngine engine = null;
 		protected IEditorPart activeEditor;
 		
@@ -62,8 +62,7 @@
 		
 		@Override
 		public void createPartControl(Composite parent) {
-	        this.viewer = new ModifiableZestContentViewer();
-	        viewer.createControl(parent, SWT.BORDER);
+	        this.viewer = new ViatraGraphViewer(parent, SWT.BORDER);
 		}
 
 		@Override
@@ -82,8 +81,8 @@
 			}
 		}
 
-		protected ILayoutAlgorithm getLayout() {
-			return new SpaceTreeLayoutAlgorithm();
+		protected LayoutAlgorithm getLayout() {
+			return new TreeLayoutAlgorithm();
 		}
 		
 		@Override
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
index 4aecd85..ec0217d 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: CPS Demonstrator UI Contributions
 Bundle-Vendor: Eclipse VIATRA Project
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.application.ui;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.databinding.observable,
  org.eclipse.emf.edit,
@@ -12,9 +12,9 @@
  org.eclipse.jface.databinding,
  org.eclipse.ui,
  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.query.runtime.ui;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.ui;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro,
  org.eclipse.xtext.xbase.lib,
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
index b72e5d9..4453bf9 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.application.ui</artifactId>
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/src/org/eclipse/viatra/examples/cps/application/ui/cpsgenerator/ConstraintTypePage.java b/cps/application/org.eclipse.viatra.examples.cps.application.ui/src/org/eclipse/viatra/examples/cps/application/ui/cpsgenerator/ConstraintTypePage.java
index 5d4948c..8a2401e 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/src/org/eclipse/viatra/examples/cps/application/ui/cpsgenerator/ConstraintTypePage.java
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/src/org/eclipse/viatra/examples/cps/application/ui/cpsgenerator/ConstraintTypePage.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -224,35 +224,35 @@
     private DataBindingContext initDataBindings() {
         DataBindingContext bindingContext = new DataBindingContext();
 
-        IObservableValue<?> observeEnabledLblSimpleTypeObserveWidget = WidgetProperties.enabled()
+        IObservableValue<Boolean> observeEnabledLblSimpleTypeObserveWidget = WidgetProperties.enabled()
                 .observe(simpleTypeLabel);
-        IObservableValue<?> observeSelectionSimpleRadioButtonObserveWidget = WidgetProperties.selection()
+        IObservableValue<Boolean> observeSelectionSimpleRadioButtonObserveWidget = WidgetProperties.buttonSelection()
                 .observe(simpleRadioButton);
         bindingContext.bindValue(observeEnabledLblSimpleTypeObserveWidget,
                 observeSelectionSimpleRadioButtonObserveWidget, null, null);
 
-        IObservableValue<?> observeEnabledSimpleTypeComboObserveWidget = WidgetProperties.enabled()
+        IObservableValue<Boolean> observeEnabledSimpleTypeComboObserveWidget = WidgetProperties.enabled()
                 .observe(simpleType.getCombo());
         bindingContext.bindValue(observeEnabledSimpleTypeComboObserveWidget,
                 observeSelectionSimpleRadioButtonObserveWidget, null, null);
 
-        IObservableValue<?> observeEnabledScalableTypeComboObserveWidget = WidgetProperties.enabled()
+        IObservableValue<Boolean> observeEnabledScalableTypeComboObserveWidget = WidgetProperties.enabled()
                 .observe(scalableType.getCombo());
-        IObservableValue<?> observeSelectionScalableRadioButtonObserveWidget = WidgetProperties.selection()
+        IObservableValue<Boolean> observeSelectionScalableRadioButtonObserveWidget = WidgetProperties.buttonSelection()
                 .observe(scalableRadioButton);
         bindingContext.bindValue(observeEnabledScalableTypeComboObserveWidget,
                 observeSelectionScalableRadioButtonObserveWidget, null, null);
 
-        IObservableValue<?> observeEnabledScaleTextObserveWidget = WidgetProperties.enabled().observe(scaleText);
+        IObservableValue<Boolean> observeEnabledScaleTextObserveWidget = WidgetProperties.enabled().observe(scaleText);
         bindingContext.bindValue(observeEnabledScaleTextObserveWidget, observeSelectionScalableRadioButtonObserveWidget,
                 null, null);
 
-        IObservableValue<?> observeEnabledLblScalableTypeObserveWidget = WidgetProperties.enabled()
+        IObservableValue<Boolean> observeEnabledLblScalableTypeObserveWidget = WidgetProperties.enabled()
                 .observe(scalableTypeLabel);
         bindingContext.bindValue(observeEnabledLblScalableTypeObserveWidget,
                 observeSelectionScalableRadioButtonObserveWidget, null, null);
 
-        IObservableValue<?> observeEnabledLblScaleObserveWidget = WidgetProperties.enabled().observe(scaleLabel);
+        IObservableValue<Boolean> observeEnabledLblScaleObserveWidget = WidgetProperties.enabled().observe(scaleLabel);
         bindingContext.bindValue(observeEnabledLblScaleObserveWidget, observeSelectionScalableRadioButtonObserveWidget,
                 null, null);
 
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
index 48b8814..d94da91 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment.edit;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.deployment.provider.DeploymentEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
index d63511c..b44defa 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.deployment.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
index 05eb97b..b2f4af7 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
index c62e707..efad0a2 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.deployment</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
index 4d7b810..ac3e8d7 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.edit;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.provider.ModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
index 36ed170..841dc1c 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
index f5a3834..b263451 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.editor;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.presentation.ModelEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
index 4602f3d..9d21d80 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model.editor</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
index 1fc841a..6abf732 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
index f05bdce..c3cab53 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
index cf52c04..db12e95 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability.edit;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.traceability.provider.TraceabilityEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
index 8eb8b37..edd7b5f 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.traceability.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
index b934b6d..7cdf49c 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0";visibility:=reexport,
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0";visibility:=reexport
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.viatra.examples.cps.traceability,
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
index 4d80519..8dc7106 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.traceability</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
index b401ee9..48d7536 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Model Generator Implementation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.generator,
   org.eclipse.viatra.examples.cps.generator.dtos,
@@ -16,15 +16,15 @@
   org.eclipse.viatra.examples.cps.generator.phases,
   org.eclipse.viatra.examples.cps.generator.queries,
   org.eclipse.viatra.examples.cps.generator.utils
-Require-Bundle: org.eclipse.viatra.examples.cps.planexecutor;bundle-version="0.1.0";visibility:=reexport,
+Require-Bundle: org.eclipse.viatra.examples.cps.planexecutor;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
   org.eclipse.xtend.lib,
   com.google.guava,
   org.eclipse.xtext.xbase.lib,
-  org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.generator
 Import-Package: org.apache.log4j
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
index 24e8a5b..cabfdf5 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.generator</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
index 22c4bfa..4fe4f8b 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.planexecutor;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.planexecutor,
  org.eclipse.viatra.examples.cps.planexecutor.api
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
index 622b4a6..a185987 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.planexecutor</artifactId>
diff --git a/cps/pom.xml b/cps/pom.xml
index 6c135d1..ed438b3 100644
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.viatra.examples.cps</groupId>
 	<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
-	<version>2.8.0-SNAPSHOT</version>
+	<version>2.9.0-SNAPSHOT</version>
 	<name>CPS Demonstrator</name>
 	<url></url>
 	<packaging>pom</packaging>
@@ -81,7 +81,7 @@
 		<tycho.version>1.7.0</tycho.version>
 		<xtend.compiler.version>2.22.0</xtend.compiler.version>
 		<viatra.repository.url>http://download.eclipse.org/viatra/updates/integration/latest</viatra.repository.url>
-		<viatra.compiler.version>2.8.0-SNAPSHOT</viatra.compiler.version>
+		<viatra.compiler.version>2.9.0-SNAPSHOT</viatra.compiler.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
index 0c37e48..ba32047 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Query Definitions
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.deployment.common,
  org.eclipse.viatra.examples.cps.deployment.viewer,
@@ -10,12 +10,12 @@
  org.eclipse.viatra.examples.cps.model.validation,
  org.eclipse.viatra.examples.cps.model.viewer,
  org.eclipse.viatra.examples.cps.traceability
-Require-Bundle: org.eclipse.viatra.examples.cps.deployment,
- org.eclipse.viatra.examples.cps.model,
+Require-Bundle: org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.queries
 Import-Package: org.apache.log4j
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
index 5e749ff..443f420 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.queries</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
index 10e44f0..165bb7e 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.application.dependencies.feature"
       label="CPS Demonstrator Application dependencies"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
@@ -16,102 +16,54 @@
 
    <plugin
          id="com.google.guava"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.google.inject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.google.inject.multibindings"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.launch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.language"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.commons.cli"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.platform.doc.isv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.xpand"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.xtend.typesystem.emf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.xtend"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.mwe.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.mwe.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.inject.assistedinject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
index 210417d..0f236b6 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
index a640b6d..e6e66db 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.application.feature"
       label="CPS Demonstrator Application"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
index c15899d..02829e7 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
index 43767fc..6463d51 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="VIATRA CPS Demonstrator Application Product" uid="org.eclipse.viatra.examples.cps.application.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.1.0" useFeatures="true" includeLaunchers="true">
+<product name="VIATRA CPS Demonstrator Application Product" uid="org.eclipse.viatra.examples.cps.application.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.1.0" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -73,49 +73,6 @@
       <feature id="org.eclipse.equinox.p2.extras.feature"/>
       <feature id="org.eclipse.equinox.p2.rcp.feature"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.fx.runtime.min.feature"/>
-      <feature id="org.eclipse.gef.common"/>
-      <feature id="org.eclipse.gef.common.doc"/>
-      <feature id="org.eclipse.gef.common.sdk"/>
-      <feature id="org.eclipse.gef.common.source"/>
-      <feature id="org.eclipse.gef.fx"/>
-      <feature id="org.eclipse.gef.fx.doc"/>
-      <feature id="org.eclipse.gef.fx.jface"/>
-      <feature id="org.eclipse.gef.fx.jface.source"/>
-      <feature id="org.eclipse.gef.fx.sdk"/>
-      <feature id="org.eclipse.gef.fx.source"/>
-      <feature id="org.eclipse.gef.fx.swt"/>
-      <feature id="org.eclipse.gef.fx.swt.source"/>
-      <feature id="org.eclipse.gef.geometry"/>
-      <feature id="org.eclipse.gef.geometry.convert.fx"/>
-      <feature id="org.eclipse.gef.geometry.convert.fx.source"/>
-      <feature id="org.eclipse.gef.geometry.convert.swt"/>
-      <feature id="org.eclipse.gef.geometry.convert.swt.source"/>
-      <feature id="org.eclipse.gef.geometry.doc"/>
-      <feature id="org.eclipse.gef.geometry.sdk"/>
-      <feature id="org.eclipse.gef.geometry.source"/>
-      <feature id="org.eclipse.gef.graph"/>
-      <feature id="org.eclipse.gef.graph.doc"/>
-      <feature id="org.eclipse.gef.graph.sdk"/>
-      <feature id="org.eclipse.gef.graph.source"/>
-      <feature id="org.eclipse.gef.layout"/>
-      <feature id="org.eclipse.gef.layout.doc"/>
-      <feature id="org.eclipse.gef.layout.sdk"/>
-      <feature id="org.eclipse.gef.layout.source"/>
-      <feature id="org.eclipse.gef.mvc.doc"/>
-      <feature id="org.eclipse.gef.mvc.fx"/>
-      <feature id="org.eclipse.gef.mvc.fx.source"/>
-      <feature id="org.eclipse.gef.mvc.fx.ui"/>
-      <feature id="org.eclipse.gef.mvc.fx.ui.source"/>
-      <feature id="org.eclipse.gef.mvc.sdk"/>
-      <feature id="org.eclipse.gef.zest.doc"/>
-      <feature id="org.eclipse.gef.zest.fx"/>
-      <feature id="org.eclipse.gef.zest.fx.jface"/>
-      <feature id="org.eclipse.gef.zest.fx.jface.source"/>
-      <feature id="org.eclipse.gef.zest.fx.source"/>
-      <feature id="org.eclipse.gef.zest.fx.ui"/>
-      <feature id="org.eclipse.gef.zest.fx.ui.source"/>
-      <feature id="org.eclipse.gef.zest.sdk"/>
       <feature id="org.eclipse.help"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.pde"/>
@@ -127,9 +84,9 @@
       <feature id="org.eclipse.viatra.addon.viewers.runtime.feature"/>
       <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature"/>
       <feature id="org.eclipse.viatra.addon.viewers.tooling.feature"/>
-      <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.8.0.qualifier"/>
-      <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.8.0.qualifier"/>
-      <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.8.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.9.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.9.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.9.0.qualifier"/>
       <feature id="org.eclipse.viatra.query.language.feature"/>
       <feature id="org.eclipse.viatra.query.runtime.feature"/>
       <feature id="org.eclipse.viatra.query.sdk.feature"/>
@@ -149,6 +106,7 @@
       <feature id="org.eclipse.viatra.transformation.runtime.debug.feature"/>
       <feature id="org.eclipse.viatra.query.testing.sdk.feature"/>
       <feature id="org.eclipse.viatra.query.ide.feature"/>
+      <feature id="org.eclipse.zest" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
index 74c864a..ce33261 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
@@ -6,7 +6,7 @@
     <parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.eclipse.viatra.examples.cps.application.product</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
index 2ccf62b..884ff3d 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
@@ -22,7 +22,7 @@
 	
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
 		<relativePath>../..</relativePath>
 	</parent>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
index 355c415..eb9b0e5 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.metamodel.feature"
       label="CPS metamodels"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
index 98b71ab..871d2c2 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
index 9d2452c..b6b8dd2 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
+++ b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
@@ -11,7 +11,7 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
     name="viatra.cps.demo"
     label="VIATRA CPS Demo">
   <setupTask
@@ -113,14 +113,6 @@
     <requirement
         name="org.eclipse.emf.sdk.feature.group"/>
     <requirement
-        name="org.eclipse.fx.ide.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.gef.zest.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.gef.graph.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.gef.layout.sdk.feature.group"/>
-    <requirement
         name="org.eclipse.viatra.transformation.debug.feature.feature.group"/>
     <repository
         url="${viatra.repository.url}"/>
@@ -160,20 +152,18 @@
           name="org.eclipse.viatra.addon.viewers.tooling.feature.feature.group"
           versionRange="[2.0.0,3.0.0)"/>
       <requirement
-          name="org.eclipse.fx.runtime.min.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.gef.zest.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gef.graph.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gef.layout.sdk.feature.group"/>
-      <requirement
           name="org.eclipse.viatra.transformation.debug.feature.feature.group"
           versionRange="[0.22.0,0.23.0)"/>
       <requirement
           name="org.eclipse.draw2d.feature.group"/>
       <requirement
           name="org.eclipse.emf.validation.feature.group"/>
+      <requirement
+          name="org.eclipse.zest.feature.group"/>
+      <requirement
+          name="org.eclipse.zest.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.zest.source.feature.group"/>
       <repositoryList
           name="Dependencies">
         <repository
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
index cdaa851..18f6e23 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
@@ -10,9 +10,7 @@
             <unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.200.v20200528-0603"/>
             <unit id="org.eclipse.sdk.feature.group" version="4.16.0.v20200604-0951"/>
             <unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>
-            <unit id="org.eclipse.gef.graph.sdk.feature.group" version="5.1.0.202006020202"/>
-            <unit id="org.eclipse.gef.zest.sdk.feature.group" version="5.1.2.202006020202"/>
-            <unit id="org.eclipse.gef.layout.sdk.feature.group" version="5.0.0.202006020202"/>
+            <unit id="org.eclipse.zest.feature.group" version="1.7.0.201606061308" />
             <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.3.v20200520-0756"/>
             <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="2.11.3.v20200520-0756"/>
             <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.11.3.v20200520-0756"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
index 6540585..9cd38a5 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.target</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
index 4ba1fc0..83cb691 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_2.8.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.8.0.qualifier">
+   <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_2.9.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.9.0.qualifier">
       <category name="org.eclipse.viatra.examples.cps"/>
    </feature>
-   <feature url="features/org.eclipse.viatra.examples.cps.application.feature_2.8.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="2.8.0.qualifier">
+   <feature url="features/org.eclipse.viatra.examples.cps.application.feature_2.9.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="2.9.0.qualifier">
       <category name="org.eclipse.viatra.examples.cps"/>
    </feature>
    <category-def name="org.eclipse.viatra.examples.cps" label="CPS Demonstrator"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
index 804c1a2..7baeb43 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-repository</packaging>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
index 3f0eede..41027cc 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model Generator Tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator.tests;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.generator.tests
 Require-Bundle: org.eclipse.xtend.lib,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
index 3622a44..870080b 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.generator.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
index 52270b6..8114474 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Tests Common
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.tests.util
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.tests.util
 Require-Bundle: org.eclipse.xtend.lib,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
index b3e32b1..c7a48f1 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.tests.util</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
index 06f26ed..b5de0c9 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.tests;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.tests
 Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.xform.m2m.incr.expl,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.simple,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized,
- org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt,
- org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr,
- org.eclipse.viatra.examples.cps.tests.util;visibility:=reexport,
- org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.examples.cps.xform.m2m.launcher;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.viatra.query.runtime.rete;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.tests.util;visibility:=reexport;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.launcher;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.collections;bundle-version="9.0.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra;bundle-version="0.0.1"
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j;version="1.2.15"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.tests
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
index 0c81c5b..598ec32 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
index 343b979..f1ef007 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Tests for M2T Transformation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.tests;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.apache.log4j;bundle-version="1.2.15",
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
index 9fb86b2..83ad8ad 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
index f15286a..9703d52 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator serializer tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.test
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
index 74ef781..d2a3a3f 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.test</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
index 9197722..73e8de6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.batch.eiq
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq,
   org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq.queries
 Require-Bundle: org.eclipse.emf.ecore,
   org.eclipse.xtext.xbase.lib,
-  org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.xform.m2m.util,
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq
 Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
index 50eed5f..b95bf63 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
index 4121455..1ceb61c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@
 Bundle-Name: Optimized
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized
 Bundle-Vendor: IncQueryLabs Ltd.
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0"
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)"
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized
 Import-Package: org.apache.log4j;version="1.2.15"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
index 87b8c39..3550a20 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
index 0740cd2..d2605b8 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Simple
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple
 Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0"
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j;version="1.2.15"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
index b3495c2..f0a78db 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.simple</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
index f200b0a..3401453 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra,
   org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra.patterns
 Require-Bundle: org.eclipse.emf.ecore,
-  org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.xtend.lib,
-  org.eclipse.viatra.query.runtime,
-  org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.29.0)"
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.29.0,0.30.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
index e371f14..3ab106b 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
index 6605fa9..f66d8fa 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Aggr
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr.queries
 Require-Bundle: com.google.guava,
   org.eclipse.xtend.lib,
   org.eclipse.xtext.xbase.lib,
   org.eclipse.emf.ecore,
-  org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.viatra.examples.cps.xform.m2m.util,
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
index 40d9c87..7202e4b 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
index f0b9204..7ba99cb 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model-To-Model Transformations
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.expl.queries
-Require-Bundle: org.eclipse.viatra.examples.cps.traceability,
-  org.eclipse.viatra.examples.cps.deployment,
-  org.eclipse.viatra.examples.cps.model,
+Require-Bundle: org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.emf.ecore,
   org.eclipse.xtext.xbase.lib,
-  org.eclipse.viatra.examples.cps.xform.m2m.util,
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl
 Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
index 1378b87..68af123 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.expl</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/META-INF/MANIFEST.MF
index b94816a..25daa8a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra.queries
-Require-Bundle: org.eclipse.viatra.transformation.runtime.emf,
- org.eclipse.viatra.transformation.evm,
+Require-Bundle: org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.viatra.query.runtime,
- org.eclipse.viatra.query.runtime.rete,
- org.eclipse.viatra.query.runtime.localsearch,
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.model;bundle-version="2.8.0",
- org.eclipse.viatra.examples.cps.deployment;bundle-version="2.8.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="2.8.0",
- org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="2.8.0",
- org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.29.0)"
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.29.0,0.30.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/pom.xml
index d7c023e..5ef08f9 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
index 18f572e..365ef8e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.incr.qrt
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.queries,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.rules
 Require-Bundle: org.eclipse.emf.ecore,
-  org.eclipse.viatra.examples.cps.model,
-  org.eclipse.viatra.examples.cps.deployment,
-  org.eclipse.viatra.examples.cps.traceability,
-  org.eclipse.viatra.examples.cps.xform.m2m.util,
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.xtend.lib,
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
index 75d3dfd..3a118fa 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
index 7941c88..aa304ba 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.patterns
 Require-Bundle: org.eclipse.emf.ecore,
-  org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
-  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0",
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.xtend.lib,
-  org.eclipse.viatra.query.runtime,
-  org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.29.0)"
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.29.0,0.30.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
index c412c43..8851116 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.8.0-SNAPSHOT</version>
+		<version>2.9.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
index 644ff4e..42dba28 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Transformation Launcher
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.launcher
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.launcher
 Import-Package: org.apache.log4j
-Require-Bundle: org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.xtend.lib,
- org.eclipse.viatra.query.runtime.rete,
- org.eclipse.viatra.query.runtime.localsearch,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra;bundle-version="0.0.1",
- org.eclipse.viatra.query.runtime
+ org.eclipse.viatra.query.runtime.rete;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.m2m.incr.puregratra;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.launcher
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
index dccd430..b48e7c4 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.launcher</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
index f348e38..c278cfe 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Transformation Util
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.util
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0"
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)"
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.util
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.util
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
index 1e29e1f..c5bddfa 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.util</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
index 7511804..aca2f1c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Proto Distribution Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.distributed
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.distributed
 Require-Bundle: org.eclipse.xtext.xbase.lib,
-  org.eclipse.viatra.examples.cps.deployment,
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
   org.apache.log4j;bundle-version="1.2.15",
-  org.eclipse.viatra.examples.cps.queries,
+  org.eclipse.viatra.examples.cps.queries;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.jdt.core;bundle-version="3.10.0",
   org.eclipse.text,
-  org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)"
+  org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2t.distributed
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
index 92c2662..4230aed 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.distributed</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
index bc620bf..b5d5276 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator JDT M2T Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.jdt
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.jdt
 Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.deployment,
- org.eclipse.viatra.examples.cps.queries,
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.queries;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="3.10.0",
  org.eclipse.core.resources;bundle-version="3.9.0",
- org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2t.jdt
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
index fc09ca8..8abd40c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.jdt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
index 3516250..1abf52d 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2T API
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.api,
   org.eclipse.viatra.examples.cps.xform.m2t.exceptions,
   org.eclipse.viatra.examples.cps.xform.m2t.monitor,
   org.eclipse.viatra.examples.cps.xform.m2t.util
 Require-Bundle: org.eclipse.xtext.xbase.lib,
-  org.eclipse.viatra.examples.cps.deployment,
+  org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
   org.apache.log4j;bundle-version="1.2.15",
-  org.eclipse.viatra.examples.cps.queries,
+  org.eclipse.viatra.examples.cps.queries;bundle-version="[2.9.0,3.0.0)",
   org.eclipse.jdt.core;bundle-version="3.10.0",
   org.eclipse.text,
   org.eclipse.xtend.lib,
-  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.evm
+  org.eclipse.viatra.query.runtime;bundle-version="[2.9.0,3.0.0)",
+  org.eclipse.viatra.transformation.evm;bundle-version="[2.9.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2t
 Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
index 4ebf6cc..af972e6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
index 3096a29..3aad8f7 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator eclipse based serializer
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.eclipse
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
- org.eclipse.viatra.examples.cps.xform.serializer,
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
+ org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="3.10.0",
  com.google.guava;bundle-version="15.0.0"
 Export-Package: org.eclipse.viatra.examples.cps.xform.serializer.eclipse
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
index 6a9b82b..a292aab 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.eclipse</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
index 582eba1..abbef96 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator java i/o based serializer
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.javaio
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
- org.eclipse.viatra.examples.cps.xform.serializer,
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
+ org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="[2.9.0,3.0.0)",
  com.google.guava;bundle-version="15.0.0",
  org.eclipse.xtend.lib;bundle-version="2.12.0",
  org.eclipse.xtend.lib.macro;bundle-version="2.12.0"
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
index 721bc87..397e3d7 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.javaio</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
index 66c63f4..95d1ba2 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator serializer API
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.serializer
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.model;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="[2.9.0,3.0.0)",
  com.google.guava
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.serializer
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
index 7b89d63..4d9fff3 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer</artifactId>