--- a/package_definition.xml	Mon May 24 18:38:31 2010 +0100
+++ b/package_definition.xml	Tue Jun 22 11:02:32 2010 +0100
@@ -36,9 +36,6 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
-      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-      </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
         <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
       </component>
@@ -135,5 +132,18 @@
 			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
       </component>
     </collection>
+    <collection id="cbsref" name="CBS Reference" level="plugin">
+      <component id="csyrefplugins" name="CSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
+        <unit bldFile="cbsref/csyrefplugins/group"/>
+      </component>
+      <component id="telephonyrefplugins" name="TSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
+        <unit bldFile="cbsref/telephonyrefplugins/group"/>
+      </component>
+    </collection>        
+    <collection id="wapstack" name="WAP Stack" level="plugin">
+      <component id="wapmessageapi" name="WAP Message API" purpose="optional">
+        <unit bldFile="wapstack/wapmessageapi/group" mrp="wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp" /> 
+      </component>
+    </collection>
   </package>
 </SystemDefinition>