--- a/package_definition.xml	Tue Aug 31 16:23:08 2010 +0300
+++ b/package_definition.xml	Wed Sep 01 12:40:21 2010 +0100
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-    <meta rel="License">
-      <license type="EPL"><supplier>Nokia</supplier></license>	
-    </meta>
     <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
+      <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
+        <unit bldFile="basebandabstraction/isc_if/group"/>
+      </component>
     </collection>
     <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
     </collection>
-   
+    <collection id="fax" name="Fax" level="server">
+      <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+        <unit bldFile="fax/faxclientandserver/Group" mrp="fax/faxclientandserver/Group/telephony_fax.mrp"/>
+      </component>
+    </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
       <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
         <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
@@ -36,7 +40,7 @@
       <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" deprecated="^3" purpose="optional" filter="test">
+      <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">
@@ -70,7 +74,7 @@
       <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
       </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
         <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
       </component>
       <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
@@ -86,6 +90,14 @@
         <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
       </component>
     </collection>
+    <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
+      <component id="gennif" filter="s60" name="Generic NIF">
+        <unit bldFile="commonnetworkinterface/gennif/group"/>
+      </component>
+      <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
+        <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
+      </component>
+    </collection>
     <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
       <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
         <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -98,6 +110,9 @@
       </component>
     </collection>
     <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+      <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
+        <unit bldFile="cellularsrv_plat/group"/>
+      </component>
       <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
         <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
       </component>
@@ -124,18 +139,5 @@
 			  <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>