diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index f65a9e3..6f8517e 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -24,6 +24,7 @@
             name="JBoss Maven Integration"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -41,6 +42,7 @@
             name="JBoss Maven CDI Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.cdi.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -58,6 +60,7 @@
             name="JBoss Maven Hibernate Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.hibernate.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -75,6 +78,7 @@
             name="JBoss Maven JAX-RS Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.jaxrs.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -92,6 +96,7 @@
             name="JBoss Maven JSF Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.jsf.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -109,6 +114,7 @@
             name="JBoss Maven Portlet Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.portlet.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -126,6 +132,7 @@
             name="JBoss Maven Seam Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.seam.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -143,6 +150,7 @@
             name="JBoss Maven JPA Configurator"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.jpa.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -160,6 +168,7 @@
             name="Maven Profile Management UI"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.jboss.tools.maven.profiles.feature"/>
          <icon
                image32="images/jbosstools_icon32.png">
          </icon>
@@ -178,6 +187,7 @@
             name="Maven Integration for Eclipse (m2e)"
             provider="eclipse.org"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+	    <iu id="org.eclipse.m2e.feature"/>
          <icon
                image32="images/m2e_32.gif">
          </icon>
@@ -195,6 +205,7 @@
             name="Maven Integration for Web Tools (m2e-wtp)"
             provider="eclipse.org"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+	    <iu id="org.maven.ide.eclipse.wtp.feature"/>
          <icon
                image32="images/m2e_32.gif">
          </icon>
@@ -223,6 +234,7 @@
             name="Eclipse EGit"
             provider="eclipse.org"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+	    <iu id="org.eclipse.egit"/>
          <icon
                image32="images/egit_32.png">
          </icon>
@@ -257,19 +269,21 @@
             id="org.jboss.tools.central.discovery.testing"
             name="Testing"
             relevance="60">
- 			<group id="bundled" /> 
- 			<group id="extra" />
+ 		<group id="org.jboss.tools.central.discovery.testing.local" />
+ 		<group id="org.jboss.tools.central.discovery.testing.remote" />
       </connectorCategory>
       
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.local"
             description="Tool support for FindBugs"
-            id="com.jboss.jbds.findbugs.feature"
+            id="edu.umd.cs.findbugs.plugin.eclipse"
             kind="task"
             license="Free, LGPL"
             name="FindBugs"
             provider="FindBugs Project"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+	    <iu id="com.jboss.jbds.findbugs.feature"/>
          <icon
                image32="images/findbugs_32.png">
          </icon>
@@ -279,34 +293,20 @@
       </connectorDescriptor>
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
-            description="Tool support for JRebel"
-            id="org.zeroturnaround.eclipse.feature"
-            kind="task"
-            license="Commercial"
-            name="JRebel"
-            provider="zeroturnaround.org"
-            siteUrl="http://www.zeroturnaround.com/update-site/">
-            <iu id="org.zeroturnaround.eclipse.feature"/>
-            <iu id="org.zeroturnaround.eclipse.nature.feature"/>
-            <iu id="org.zeroturnaround.eclipse.debug.feature"/>
-            <iu id="org.zeroturnaround.eclipse.wtp.feature"/>
-            <iu id="org.zeroturnaround.eclipse.embedder.feature"/>
-         <icon
-               image32="images/jrebel_32.png">
-         </icon>
-         <overview
-               url="http://zeroturnaround.com/jrebel/current/">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.local"
             description="Tool support for JSLint"
-            id="com.jboss.jbds.jslint.feature"
+            id="com.rockstarapps.workbench.branding.feature"
             kind="task"
             license="Free, ASL"
             name="JSLint"
             provider="Rockstarapps.com"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+            <iu id="com.jboss.jbds.jslint.feature"/>
+            <iu id="com.rockstarapps.aws.feature"/>
+	    <iu id="com.rockstarapps.html.core.feature"/>
+	    <iu id="com.rockstarapps.jsLex"/>
+	    <iu id="com.rockstarapps.jsLint"/>
+	    <iu id="com.rockstarapps.workbench.branding.feature"/>
          <icon
                image32="images/jslint_32.png">
          </icon>
@@ -316,13 +316,15 @@
       </connectorDescriptor>
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.local"
             description="Tool support for PMD"
-            id="com.jboss.jbds.pmd.feature"
+            id="net.sourceforge.pmd.eclipse"
             kind="task"
             license="Free, PMD License"
             name="PMD"
             provider="PMD Developers"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+	    <iu id="com.jboss.jbds.pmd.feature"/>
          <icon
                image32="images/pmd_32.png">
          </icon>
@@ -332,13 +334,15 @@
       </connectorDescriptor>
 	  <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.local"
             description="Tool support for TestNG"
-            id="com.jboss.jbds.testng.feature"
+            id="org.testng.eclipse"
             kind="task"
             license="Free, ASL"
             name="TestNG"
             provider="Cedric Beust"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+            <iu id="com.jboss.jbds.testng.feature"/>
          <icon
                image32="images/testng_32.gif">
          </icon>
@@ -348,6 +352,28 @@
                url="http://testng.org/">
          </overview>
       </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.remote"
+            description="Tool support for JRebel - requires JST Server"
+            id="org.zeroturnaround.eclipse.feature"
+            kind="task"
+            license="Commercial"
+            name="JRebel"
+            provider="zeroturnaround.org"
+            siteUrl="http://www.zeroturnaround.com/update-site/">
+            <iu id="org.zeroturnaround.eclipse.feature"/>
+            <iu id="org.zeroturnaround.eclipse.nature.feature"/>
+            <iu id="org.zeroturnaround.eclipse.debug.feature"/>
+            <iu id="org.zeroturnaround.eclipse.wtp.feature"/>
+            <iu id="org.zeroturnaround.eclipse.embedder.feature"/>
+         <icon
+               image32="images/jrebel_32.png">
+         </icon>
+         <overview
+               url="http://zeroturnaround.com/jrebel/current/">
+         </overview>
+      </connectorDescriptor>
       
       <!-- Web -->
 
@@ -356,19 +382,46 @@
             id="org.jboss.tools.central.discovery.web"
             name="Web Development"
             relevance="60">
- 			<group id="bundled" /> 
- 			<group id="extra" />
+ 			<group id="org.jboss.tools.central.discovery.web.core" /> 
+ 			<group id="org.jboss.tools.central.discovery.web.extras" />
       </connectorCategory>
 
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.web"
+            groupId="org.jboss.tools.central.discovery.web.core"
+            description="JST Server Core, UI, Adapters, Extensions, User Doc"
+            id="org.eclipse.jst.server_core.feature"
+            kind="task"
+            license="Free, EPL, Other"
+            name="JST Server"
+            provider="Eclipse.org"
+            siteUrl="http://devstudio.jboss.com/updates/5.0/staging/">
+            <iu id="org.eclipse.jst.server_adapters.ext.feature"/>
+            <iu id="org.eclipse.jst.server_adapters.feature"/>
+            <iu id="org.eclipse.jst.server_core.feature"/>
+            <iu id="org.eclipse.jst.server_ui.feature"/>
+            <iu id="org.eclipse.jst.server_userdoc.feature"/>
+         <icon
+               image32="images/wtp_32.png">
+         </icon>
+         <overview
+               url="http://eclipse.org/webtools/">
+         </overview>
+      </connectorDescriptor>
+
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.web"
+            groupId="org.jboss.tools.central.discovery.web.extras"
             description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
-            id="com.jboss.jbds.gwt.feature"
+            id="com.google.gwt.eclipse.sdkbundle.e37.feature"
             kind="task"
             license="EPL, Other"
             name="Google Plugin + Web Toolkit"
             provider="Google, Inc."
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+	    <iu id="com.jboss.jbds.gwt.feature"/>
+            <iu id="com.google.gwt.eclipse.sdkbundle.e37.feature"/>
+            <iu id="com.google.gdt.eclipse.suite.e37.feature"/>
          <icon
                image32="images/google_32.png">
          </icon>
@@ -378,13 +431,22 @@
       </connectorDescriptor>
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.web"
+            groupId="org.jboss.tools.central.discovery.web.extras"
             description="Tool support for the Spring Framework"
-            id="com.jboss.jbds.springide.feature"
+            id="org.springframework.ide.eclipse.feature"
             kind="task"
             license="Free, EPL, Other"
             name="Spring IDE"
             provider="Spring IDE Developers"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
+	    <iu id="com.jboss.jbds.springide.feature"/>
+            <iu id="org.springframework.ide.eclipse.aop.feature"/>
+            <iu id="org.springframework.ide.eclipse.autowire.feature"/>
+            <iu id="org.springframework.ide.eclipse.feature"/>
+            <iu id="org.springframework.ide.eclipse.integration.feature"/>
+            <iu id="org.springframework.ide.eclipse.osgi.feature"/>
+            <iu id="org.springframework.ide.eclipse.webflow.feature"/>
+            <iu id="org.springframework.ide.eclipse.security.feature"/>
          <icon
                image32="images/springide_32.png">
          </icon>
@@ -393,5 +455,7 @@
          </overview>
       </connectorDescriptor>
       
+      <!-- TODO: change URLs from http://download.jboss.org/jbosstools/updates/indigo/SR2/ to http://download.jboss.org/jbosstools/updates/indigo/ after Beta1 -->
+      
 	</extension>
 </plugin>