diff --git a/org.eclipse.osbp.softwarefactory.feature/feature.xml b/org.eclipse.osbp.softwarefactory.feature/feature.xml
index e59425c..89c845e 100644
--- a/org.eclipse.osbp.softwarefactory.feature/feature.xml
+++ b/org.eclipse.osbp.softwarefactory.feature/feature.xml
@@ -75,10 +75,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.osbp.ecview.feature.jetty"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.osbp.ecview.feature.ide"
          version="0.0.0"/>
 
diff --git a/org.eclipse.osbp.softwarefactory.p2/pom.xml b/org.eclipse.osbp.softwarefactory.p2/pom.xml
index 9d5970d..b20e0eb 100644
--- a/org.eclipse.osbp.softwarefactory.p2/pom.xml
+++ b/org.eclipse.osbp.softwarefactory.p2/pom.xml
@@ -27,6 +27,15 @@
     
     </properties>
     
+    
+    <dependencies>
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
+			<artifactId>org.eclipse.osbp.dependencies.bundle.vaadin.external.gwt</artifactId>
+			<version>2.7.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+	    
     <profiles>
         <profile>
             <id>build.p2</id>
diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
index 9954136..93c65d3 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
@@ -30,6 +30,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.osbp.dependencies.feature.apache.cxf"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.osbp.dependencies.feature.apache.pdfbox"
          version="0.0.0"/>
 
@@ -249,6 +253,14 @@
          id="org.eclipse.osbp.runtime.functionlibrary.validation.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.osbp.ecview.feature.jetty"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.osbp.dependencies.feature.jackson.core"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.osbp.abstractstatemachine"
          download-size="0"
@@ -285,13 +297,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osbp.dependencies.bundle.vaadin.external.gwt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.osbp.dsl.common.xtext"
          download-size="0"
          install-size="0"
@@ -572,13 +577,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osbp.ecview.jetty.manager"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.osbp.ecview.uisemantics"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
index 98abeba..ccd7f0e 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
@@ -22,6 +22,12 @@
 			<type>eclipse-feature</type>
 		</dependency>
 		<dependency>
+			<groupId>org.eclipse.osbp.vaaclipse.addons.common.api</groupId>
+			<artifactId>org.eclipse.osbp.vaaclipse.addons.common.api.feature</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+		</dependency>
+		<dependency>
 			<groupId>org.eclipse.osbp.vaaclipse.addons</groupId>
 			<artifactId>org.eclipse.osbp.vaaclipse.addons.feature</artifactId>
 			<version>${project.version}</version>
@@ -177,6 +183,20 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.osbp.dependencies</groupId>
+			<artifactId>org.eclipse.osbp.dependencies.feature.apache.cxf</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
+			<artifactId>
+				org.eclipse.osbp.dependencies.feature.jackson.core
+			</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
 			<artifactId>org.eclipse.osbp.dependencies.feature.vaadin.external</artifactId>
 			<version>${project.version}</version>
 			<type>eclipse-feature</type>
@@ -242,6 +262,7 @@
 						<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" />
 						<feature id="org.eclipse.ecf.filetransfer.ssl.feature" />
 						<feature id="org.eclipse.osbp.dependencies.feature.apache.commons" />
+						<feature id="org.eclipse.osbp.dependencies.feature.apache.cxf" />
 						<feature id="org.eclipse.osbp.dependencies.feature.apache.pdfbox" />
 						<feature id="org.eclipse.osbp.dependencies.feature.assert_utilities" />
 						<feature