diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index 39faff7..b68dff2 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -32,14 +32,16 @@
       <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.103" />
       <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.core" version="1.0.102" />
       <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0"/>
       <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.core" version="1.0.304" match="compatible"/>
+      <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index 264775c..0d345f6 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -36,18 +36,24 @@
       <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.junit" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.103" />
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.103" />
-      <import plugin="org.eclipse.jst.server.core" version="1.0.103" />
       <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" />
       <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.debug.ui" version="3.2.100" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.core" version="1.0.1"/>
       <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.core" version="1.0.103" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.ui" version="1.0.103" match="compatible"/>
+      <import plugin="org.eclipse.jst.server.core" version="1.0.103" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.jst.server.generic.core" version="1.0.1" match="compatible"/>
+      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
+      <import plugin="org.eclipse.core.variables" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
    </requires>
 
    <plugin