--- a/platform_foundationmodel/job_props.ant.xml	Thu Apr 16 18:22:33 2009 +0100
+++ b/platform_foundationmodel/job_props.ant.xml	Fri Apr 17 17:32:44 2009 +0100
@@ -54,7 +54,7 @@
     <property name="sf.spec.dirdelta.enable" value="true"/>
 
     <!-- prefilter raptor logs -->
-    <property name="sf.spec.logs.raptorfilter.enable" value="true"/>
+    <property name="sf.spec.logs.raptorfilter.enable" value="false"/>
     
     <!-- zip all logs before publish -->
     <property name="sf.spec.logs.zip.enable"  value="true"/>

--- a/platform_foundationmodel/sysdefs/system_definition.xml	Thu Apr 16 18:22:33 2009 +0100
+++ b/platform_foundationmodel/sysdefs/system_definition.xml	Fri Apr 17 17:32:44 2009 +0100
@@ -6,7 +6,8 @@
     <collection name="baseapitest" long-name="Base API Tests" level="test"/>
     <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
      <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3">
-      <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
      </component>
     </collection>
     <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
@@ -16,135 +17,133 @@
     </collection>
     <collection name="filesystems" long-name="File Systems" level="framework">
      <component name="compfs" long-name="Composite File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
      </component>
      <component name="fatfs" long-name="FAT File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
      </component>
      <component name="fat32fs" long-name="FAT32 File System" filter="gt" plugin="Y">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
      </component>
      <component name="iso9660fs" long-name="ISO9660 File System" filter="gt" plugin="Y" introduced="8.1b">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
      </component>
      <component name="ntfs" long-name="NTFS" filter="gt" plugin="Y">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
      </component>
      <component name="rofs" long-name="ROFS" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
      </component>
      <component name="romfs" long-name="ROM File System" filter="gt" plugin="Y">
       <unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
      </component>
      <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
      </component>
     </collection>
     <collection name="unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
      <component name="uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
      </component>
      <component name="uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1">
       <unit mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
      </component>
      <component name="uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
      </component>
      <component name="uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
      <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0">
-      <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
      </component>
     </collection>
     <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
      <component name="genericboardsupport" long-name="Generic Board Support">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
      </component>
      <component name="mediadrivers" long-name="Media Drivers">
       <!-- these are for storage media -->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
      </component>
      <component name="sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
      </component>
      <component name="sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
      </component>
     </collection>
     <collection name="halservices" long-name="HAL Services" level="framework">
      <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0">
-      <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
      </component>
     </collection>
     <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
      <component name="eka" long-name="Kernel Architecture" introduced="8.0">
-      <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
      </component>
     </collection>
     <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
      <component name="e32test" long-name="E32 Tests" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
      </component>
      <component name="e32utils" long-name="E32 Utilities">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
      </component>
      <component name="f32test" long-name="File Server Tests" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
      </component>
      <component name="sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
      </component>
     </collection>
     <collection name="localisation" long-name="Localisation" level="adaptation">
      <component name="localesupport" long-name="Locale Support" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
      </component>
     </collection>
     <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
      <component name="ethernetldd" long-name="Ethernet Drivers">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
      </component>
      <component name="btrace" long-name="Kernel Trace Tool">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
      </component>
      <component name="legacydrivers" long-name="Legacy Drivers">
       <unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
      </component>
      <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b">
       <!-- these are LDDs for storage media -->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
      </component>
      <component name="runmodedebugger" long-name="Run Mode Debugger">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
      </component>
      <component name="serialldd" long-name="Serial Port Drivers">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
      </component>
      <component name="audioldd" long-name="Audio Drivers" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
      </component>
     </collection>
     <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
      <component name="textshell" long-name="Text Shell" filter="gt">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
      </component>
      <component name="e32wsrv" long-name="Text Window Server">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
      </component>
     </collection>
     <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
@@ -152,77 +151,62 @@
       <unit mrp="os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
      </component>
      <component name="estart" long-name="Base Starter" filter="gt">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
      </component>
      <component name="compsupp" long-name="Compiler Runtime Support" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
      </component>
      <component name="domainmgr" long-name="Domain Manager" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
      </component>
      <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" plugin="Y" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
      </component>
      <component name="fileserver" long-name="File Server" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
      </component>
      <component name="nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
      </component>
      <component name="euser" long-name="User Library">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
      </component>
     </collection>
    </block>
    <block long-name="Board Support" level="hw" name="boardsupport" levels="bsp test 2 3 4">
     <collection name="emulator" long-name="Emulator" level="bsp">
      <component name="emulatorbsp" long-name="Emulator BSP">
-      <unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
      </component>
      <component name="unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="haitest" long-name="HAI Test Suites" level="test"/>
     <collection name="naviengine" long-name="NaviEngine Baseport" level="bsp"/>
     <collection name="omaph2" long-name="OMAP H2" level="bsp">
      <component name="omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
      </component>
      <component name="omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
      </component>
      <component name="omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="omaph4" long-name="OMAP H4" level="bsp">
      <component name="h4bootloader" long-name="H4 Boot Loader" introduced="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="os/boardsupport/omaph4/h4bootloader"/> -->
      </component>
      <component name="omaph4bsp" long-name="OMAP H4 BSP">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
      </component>
      <component name="omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
      </component>
      <component name="omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
      </component>
      <component name="omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="omap3variants" long-name="OMAP3 Variants" level="bsp"/>
@@ -230,49 +214,63 @@
    <block long-name="Generic OS Services" level="services" name="ossrv" levels="physical-abstraction app-libs encoding translation data-services utilities">
     <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
      <component name="ziplib" long-name="Zip Compression Library" introduced="6.0">
-      <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
      </component>
     </collection>
     <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
      <component name="cstdlib" long-name="C Standard Library" introduced="ER5">
-      <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
      </component>
      <component name="openenvcore" long-name="Open Environment Core" introduced="tb91">
-      <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
      </component>
     </collection>
     <collection name="genericservices" long-name="Generic Services" level="utilities">
      <component name="activebackupclient" long-name="Active Backup Client">
-      <unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
      </component>
      <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2">
-      <unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
      </component>
      <component name="mimerecognitionfw" long-name="MIME Recognition Framework">
-      <unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
      </component>
      <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt">
-      <unit version="9.4" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp"/>
-      <unit version="9.5" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group95" mrp="os/ossrv/genericservices/s60compatibilityheaders/group95/tools_s60_header_compat95.mrp"/>
-      <unit version="9.6" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group96" mrp="os/ossrv/genericservices/s60compatibilityheaders/group96/tools_s60_header_compat96.mrp"/>
-      <unit version="Future" bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupfuture" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupfuture/tools_s60_header_compatfuture.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="9.4" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="9.5" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group95" mrp="os/ossrv/genericservices/s60compatibilityheaders/group95/tools_s60_header_compat95.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="9.6" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group96" mrp="os/ossrv/genericservices/s60compatibilityheaders/group96/tools_s60_header_compat96.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="Future" bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupfuture" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupfuture/tools_s60_header_compatfuture.mrp"/>
      </component>
      <component name="syslibsdocs" long-name="Syslibs Documentation" class="doc">
       <unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
      </component>
      <component name="systemagent" long-name="System Agent" introduced="9.0">
-      <unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
      </component>
      <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0">
-      <unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
      </component>
     </collection>
     <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
      <component name="apputils" long-name="Application Utilities" introduced="ER5">
-      <unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
      </component>
      <component name="pluginfw" long-name="Plugin Framework" introduced="6.2">
-      <unit version="2" bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp"/>
      </component>
     </collection>
     <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
@@ -280,534 +278,555 @@
     </collection>
     <collection name="glib" long-name="Glib" level="utilities">
      <component name="glibbackend" long-name="Glib Backend">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/glibbackend/group"/>
      </component>
      <component name="libglib" long-name="Libglib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/libglib/group"/>
      </component>
      <component name="libgmodule" long-name="Libg Module">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/libgmodule/group"/>
      </component>
      <component name="libgobject" long-name="Libg Object">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/libgobject/group"/>
      </component>
      <component name="libgthread" long-name="Libg Thread">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/libgthread/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib" long-name="glib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/glib/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/glib/group"/>
      </component>
     </collection>
     <collection name="ofdbus" long-name="OF Dbus" level="utilities">
      <component name="dbus" long-name="Dbus">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
      </component>
      <component name="dbus-glib" long-name="Dbus glib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ofdbus" long-name="ofdbus">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ofdbus/group"/>
      </component>
     </collection>
     <collection name="ssl" long-name="SSL" level="data-services">
      <component name="libcrypto" long-name="Libcrypto">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ssl/libcrypto/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/libcrypto/group"/>
      </component>
      <component name="libssl" long-name="Libssl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ssl/libssl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ssl" long-name="ssl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ssl/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/group"/>
      </component>
     </collection>
     <collection name="stdcpp" long-name="Stdcpp" level="translation">
      <component name="stdcpp compo" long-name="Libstdcpp">
-      <unit bldFile="os/ossrv/stdcpp/stdcpp compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stdcpp" long-name="stdcpp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/stdcpp/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/group"/>
      </component>
     </collection>
     <collection name="stdlibs" long-name="Stdlibs" level="translation">
      <component name="libcrypt" long-name="Libcrypt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
      </component>
      <component name="libz" long-name="Libz">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/stdlibs/libz/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stdlibs" long-name="stdlibs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/stdlibs/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/group"/>
      </component>
     </collection>
     <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
      <component name="libutils" long-name="Utility Library">
-      <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ossrv" long-name="ossrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ossrv" long-name="ossrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ossrv_pub" long-name="ossrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="boost_apis" long-name="boost_apis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="character_type_apis" long-name="character_type_apis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="compiler_specific_runtime_support" long-name="compiler_specific_runtime_support">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="configuration" long-name="configuration">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cpp_wrappers" long-name="cpp_wrappers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cryptogaphy_related_api" long-name="cryptogaphy_related_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_authentication_codes_and_hash_functions_api" long-name="crypto_authentication_codes_and_hash_functions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_auxillary_functions_api" long-name="crypto_auxillary_functions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_certificates_api" long-name="crypto_certificates_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_inputoutput_and_data_encoding_api" long-name="crypto_inputoutput_and_data_encoding_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="crypto_public_key_cryptography_and_key_agreement_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_symmetric_ciphers_api" long-name="crypto_symmetric_ciphers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="crypto_utility_functions_api" long-name="crypto_utility_functions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="debug" long-name="debug">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="exceptions" long-name="exceptions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gboxed" long-name="gboxed">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_arrays" long-name="glib_arrays">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_asynchronous_queues" long-name="glib_asynchronous_queues">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_atomic_operations" long-name="glib_atomic_operations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_automatic_string_completion" long-name="glib_automatic_string_completion">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_balanced_binary_trees" long-name="glib_balanced_binary_trees">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_basic_types" long-name="glib_basic_types">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_caches" long-name="glib_caches">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_character_set_conversion" long-name="glib_character_set_conversion">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_closures" long-name="glib_closures">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_commandline_option_parser" long-name="glib_commandline_option_parser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_datasets" long-name="glib_datasets">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_date_and_time_functions" long-name="glib_date_and_time_functions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_doubleended_queues" long-name="glib_doubleended_queues">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_doublylinked_lists" long-name="glib_doublylinked_lists">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_dynamic_loading_of_modules" long-name="glib_dynamic_loading_of_modules">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_enums_and_flags" long-name="glib_enums_and_flags">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_error_reporting" long-name="glib_error_reporting">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_file_utilities" long-name="glib_file_utilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_generic_values" long-name="glib_generic_values">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_globstyle_pattern_matching" long-name="glib_globstyle_pattern_matching">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_hash_tables" long-name="glib_hash_tables">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_hook_functions" long-name="glib_hook_functions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_internationalization" long-name="glib_internationalization">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_io_channels" long-name="glib_io_channels">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_keyvalue_file_parser" long-name="glib_keyvalue_file_parser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_lexical_scanner" long-name="glib_lexical_scanner">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_main_event_loop" long-name="glib_main_event_loop">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_memory_allocation" long-name="glib_memory_allocation">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_memory_slices" long-name="glib_memory_slices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_message_logging" long-name="glib_message_logging">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_miscellaneous_utility_functions" long-name="glib_miscellaneous_utility_functions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_nary_trees" long-name="glib_nary_trees">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_parameters_and_values" long-name="glib_parameters_and_values">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_quarks" long-name="glib_quarks">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_random_numbers" long-name="glib_random_numbers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_relations_and_tuples" long-name="glib_relations_and_tuples">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_shellrelated_utilities" long-name="glib_shellrelated_utilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_signals" long-name="glib_signals">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_simple_xml_subset_parser" long-name="glib_simple_xml_subset_parser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_singlylinked_lists" long-name="glib_singlylinked_lists">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_spawning_processes" long-name="glib_spawning_processes">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_standard_macros" long-name="glib_standard_macros">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_strings" long-name="glib_strings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_string_utility_functions" long-name="glib_string_utility_functions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_threads" long-name="glib_threads">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_thread_pools" long-name="glib_thread_pools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_timers" long-name="glib_timers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_unicode_manipulation" long-name="glib_unicode_manipulation">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_value_arrays" long-name="glib_value_arrays">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glib_varargs_value_collection" long-name="glib_varargs_value_collection">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gobject" long-name="gobject">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gparamspec" long-name="gparamspec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ossrv_pub" long-name="ossrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gtype" long-name="gtype">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gtypemodule" long-name="gtypemodule">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gtypeplugin" long-name="gtypeplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="io_stream_api" long-name="io_stream_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localization_function_api" long-name="localization_function_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="math_operations_api" long-name="math_operations_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memory" long-name="memory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="no_namespace_headers" long-name="no_namespace_headers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="openc_headers" long-name="openc_headers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="openc_wrappers" long-name="openc_wrappers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ssl_general_api" long-name="ssl_general_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ssl_protocol_methods_api" long-name="ssl_protocol_methods_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="standard_compressiondecompression_api" long-name="standard_compressiondecompression_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stl" long-name="stl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thread_api" long-name="thread_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="typeinfo" long-name="typeinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="type_attributes" long-name="type_attributes">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utility_apis" long-name="utility_apis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wide_character_classapis" long-name="wide_character_classapis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
      </component>
     </collection>
@@ -816,40 +835,36 @@
     <collection name="authenticationservices" long-name="Authentication Services" level="utilities"/>
     <collection name="authorisation" long-name="Authorisation" level="utilities">
      <component name="userpromptservice" long-name="User Prompt Service" introduced="tb92">
-      <unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
      </component>
     </collection>
     <collection name="contentmgmt" long-name="Content Management" level="utilities">
      <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1">
-      <unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
      </component>
      <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="tb92">
-      <unit bldFile="os/security/contentmgmt/cafstreamingsupport/group" mrp="os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
      </component>
      <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1">
-      <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
      </component>
     </collection>
     <collection name="crypto" long-name="Crypto Libraries" level="libraries">
      <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92">
-      <unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
      </component>
      <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt">
-      <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
      </component>
      <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92">
-      <unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
      </component>
      <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt">
-      <unit bldFile="os/security/crypto/weakcrypto/group" mrp="os/security/crypto/weakcrypto/group/security_crypto_weak.mrp"/>
      </component>
     </collection>
     <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
      <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0">
-      <unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
      </component>
      <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0">
-      <unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
      </component>
      <component name="securitydocs" long-name="Security Documentation">
       <unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
@@ -858,23 +873,26 @@
       <unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
      </component>
      <component name="securityutils" long-name="Security Utils" introduced="8.0">
-      <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
      </component>
     </collection>
     <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
      <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" plugin="Y" introduced="tb92">
-      <unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
      </component>
     </collection>
     <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
      <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0">
-      <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
      </component>
      <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0">
-      <unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
      </component>
      <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0">
-      <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
      </component>
      <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s">
       <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
@@ -882,81 +900,90 @@
     </collection>
     <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
      <component name="securityconfig" long-name="Security Config" introduced="9.1">
-      <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
      </component>
      <component name="securitytools" long-name="Security Tools" class="PC" introduced="tb92">
-      <unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
      </component>
     </collection>
    </block>
    <block long-name="Persistent Data Services" level="services" name="persistentdata" levels="adaptation hw-if plugin framework server app-if">
     <collection name="databaseabstraction" long-name="Database Abstraction" level="app-if">
      <component name="dbmsemulationlib" long-name="DBMS Emulation Library" introduced="9.3">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/persistentdata/databaseabstraction/dbmsemulationlib/group" mrp="os/persistentdata/databaseabstraction/dbmsemulationlib/group/syslibs_dbmssql.mrp"/> -->
      </component>
     </collection>
     <collection name="loggingservices" long-name="Logging Services" level="server">
      <component name="eventlogger" long-name="Event Logger" introduced="6.0">
-      <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
      </component>
      <component name="filelogger" long-name="File Logger" introduced="ER5">
-      <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
      </component>
      <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1">
-      <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
      </component>
     </collection>
     <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
      <component name="centralrepository" long-name="Central Repository" introduced="7.0s">
-      <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
      </component>
      <component name="dbms" long-name="DBMS">
-      <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
      </component>
      <component name="sql" long-name="SQL" introduced="9.3">
-      <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
      </component>
      <component name="store" long-name="Store">
-      <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
      </component>
     </collection>
     <collection name="traceservices" long-name="Trace Services" level="server">
      <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s">
-      <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
      </component>
      <component name="tracefw" long-name="Trace Framework" introduced="9.2">
-      <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
      </component>
      <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91">
-      <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
      </component>
     </collection>
     <collection name="featuremgmt" long-name="Feature Management" level="framework">
      <component name="featuremgr" long-name="Feature Manager" introduced="tb92">
-      <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
      </component>
      <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="Future">
-      <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
      </component>
      <component name="featuremanager" long-name="Feature Manager">
-      <unit bldFile="os/persistentdata/featuremgmt/featuremanager/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/featuremgmt/featuremanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clientdll" long-name="clientdll">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serverexe" long-name="serverexe">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="featuremgmt" long-name="featuremgmt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/featuremgmt/group"/>
      </component>
     </collection>
@@ -966,813 +993,859 @@
     <collection name="systemhealthmanagement" long-name="System Health Management" level="server"/>
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1">
-      <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
      </component>
      <component name="reftsp" long-name="Remote Control Reference TSP" filter="techview" plugin="Y" introduced="9.1">
-      <unit bldFile="os/devicesrv/accessoryservices/reftsp/group" mrp="os/devicesrv/accessoryservices/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/devicesrv/accessoryservices/reftsp/group" mrp="os/devicesrv/accessoryservices/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
      </component>
      <component name="accessorymonitor" long-name="Accessory Monitor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
      </component>
      <component name="accessoryremotecontrol" long-name="Accessory Remote Control">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
      </component>
      <component name="accessoryserver" long-name="Accessory Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
      </component>
      <component name="headsetstatusapi" long-name="Headset Status Api">
-      <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/Group"/>
      </component>
      <component name="tspclientmapper" long-name="TSP Client Mapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessoryservices" long-name="accessoryservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/accessoryservices/group"/>
      </component>
     </collection>
     <collection name="commonservices" long-name="Common Services" level="app-if">
      <component name="PlatformEnv" long-name="Platform Env">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/PlatformEnv/group"/>
      </component>
      <component name="activitymanager" long-name="Activity Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/activitymanager/group"/>
      </component>
      <component name="commonengine" long-name="Common Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
      </component>
      <component name="commonengineresources" long-name="Common Engine Resources">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
      </component>
      <component name="sysutil" long-name="Sysutil">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/sysutil/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/sysutil/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonservices" long-name="commonservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="disknotifyhandler" long-name="disknotifyhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/PlatformEnv/disknotifyhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="platformver" long-name="platformver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/PlatformEnv/platformver/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/platformver/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sysversioninfo" long-name="sysversioninfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/commonservices/PlatformEnv/sysversioninfo/group"/>
      </component>
     </collection>
     <collection name="dosservices" long-name="Dos Services" level="hw-if">
      <component name="commondsy" long-name="Common DSY">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
      </component>
      <component name="dosserver" long-name="Dos Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dosservices" long-name="dosservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/dosservices/group"/>
      </component>
     </collection>
     <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
      <component name="hapticsclient" long-name="Haptics Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
      </component>
      <component name="hapticslicense" long-name="Haptics License">
-      <unit bldFile="os/devicesrv/hwrmhaptics/hapticslicense/group"/>
      </component>
      <component name="hapticspacketizer" long-name="Haptics Packetizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
      </component>
      <component name="hapticspluginmanager" long-name="Haptics Plugin Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
      </component>
      <component name="hapticspluginservice" long-name="Haptics Plugin Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
      </component>
      <component name="hapticsserver" long-name="Haptics Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrmhaptics" long-name="hwrmhaptics">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticseffectdatagetterfw" long-name="hapticseffectdatagetterfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsivtgetterplugin" long-name="hapticsivtgetterplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/plugins/hapticsivtgetterplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsvibepacketizerplugin" long-name="hapticsvibepacketizerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/plugins/hapticsvibepacketizerplugin/group"/>
      </component>
     </collection>
     <collection name="mediator" long-name="Mediator" level="app-if">
      <component name="MediatorClient.dll=binary">
-      <unit bldFile="os/devicesrv/mediator/group"/>
      </component>
      <component name="MediatorPluginBase.dll=binary">
-<!--       <unit bldFile="os/devicesrv/mediator/group"/> -->
      </component>
      <component name="MediatorServer.exe=binary">
-<!--       <unit bldFile="os/devicesrv/mediator/group"/> -->
      </component>
      <component name="mediatorclientstub.dll=binary">
-<!--       <unit bldFile="os/devicesrv/mediator/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mediator" long-name="mediator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/devicesrv/mediator/group"/>
      </component>
     </collection>
     <collection name="psmservices" long-name="PSM Services" level="app-if">
      <component name="psmserver" long-name="PSM Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="psmservices" long-name="psmservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/psmservices/group"/>
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
      <component name="ClientDll" long-name="Client DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/ClientDll/group"/>
      </component>
      <component name="CommonDll" long-name="Common DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/CommonDll/group"/>
      </component>
      <component name="ExtendedLightClientDll" long-name="Extended Light Client DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/ExtendedLightClientDll/group"/>
      </component>
      <component name="FmTxClientDll" long-name="FM TX Client DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/FmTxClientDll/group"/>
      </component>
      <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91">
-      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
      </component>
      <component name="LightClientDll" long-name="Light Client DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/LightClientDll/group"/>
      </component>
      <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0">
-      <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
      </component>
      <component name="ServerExe" long-name="Server Exe">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/ServerExe/group"/>
      </component>
      <component name="VibraClientDll" long-name="Vibra Client DLL">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/VibraClientDll/group"/>
      </component>
      <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
      </component>
      <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
      </component>
      <component name="vibractrl" long-name="Vibra Control">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/vibractrl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="resourcemgmt" long-name="resourcemgmt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/resourcemgmt/group"/>
      </component>
     </collection>
     <collection name="sensordrivers" long-name="Sensor Drivers" level="adaptation"/>
     <collection name="sensorservices" long-name="Sensor Services" level="framework">
      <component name="orientationssy" long-name="Orientation SSY">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
      </component>
      <component name="sensorserver" long-name="Sensor Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
      </component>
      <component name="tiltcompensationssy" long-name="Tilt Compensation SSY">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensorservices" long-name="sensorservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sensorservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensordatacompensator" long-name="sensordatacompensator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
      </component>
     </collection>
     <collection name="sysstatemgmt" long-name="System State Management" level="server">
      <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92">
-      <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
      </component>
      <component name="starter" long-name="Starter">
-      <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/legacy/starter/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sysstatemgmt" long-name="sysstatemgmt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sysstatemgmt/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="strtsecnote" long-name="strtsecnote">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="strtsecobs" long-name="strtsecobs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devicesrv" long-name="devicesrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicesrv" long-name="devicesrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devicesrv_plat" long-name="devicesrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_api" long-name="accessory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_audio_control_api" long-name="accessory_audio_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_bluetooth_control_api" long-name="accessory_bluetooth_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_control_api" long-name="accessory_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_key_event_handling_api" long-name="accessory_key_event_handling_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_plugin_api" long-name="accessory_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_policy_definitions_api" long-name="accessory_policy_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_policy_utility_api" long-name="accessory_policy_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_settings_api" long-name="accessory_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="activity_manager_api" long-name="activity_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_content_policy_api" long-name="common_content_policy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/common_content_policy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_dsy_plugin_api" long-name="common_dsy_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="configuration_file_parser_api" long-name="configuration_file_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="disk_and_memory_level_keys_api" long-name="disk_and_memory_level_keys_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="disk_notification_handler_api" long-name="disk_notification_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="display_language_definition_api" long-name="display_language_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dos_extension_api" long-name="dos_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dos_extension_plugin_api" long-name="dos_extension_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_light_api" long-name="extended_light_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/extended_light_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_startup_api" long-name="extended_startup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/extended_startup_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_version_info_api" long-name="extended_version_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_version_info_plugin_api" long-name="extended_version_info_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="feature_control_api" long-name="feature_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/feature_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="feature_info_plugin_api" long-name="feature_info_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/feature_info_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="feature_manager_api" long-name="feature_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/feature_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fm_tx_commands_api" long-name="fm_tx_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/fm_tx_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicesrv_plat" long-name="devicesrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="haptics_effect_data_getter_plugin_api" long-name="haptics_effect_data_getter_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="haptics_packetizer_plugin_api" long-name="haptics_packetizer_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="haptics_plugin_api" long-name="haptics_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="headset_status_api" long-name="headset_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrm_fmtx_api" long-name="hwrm_fmtx_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrm_fmtx_audio_policy_api" long-name="hwrm_fmtx_audio_policy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_audio_policy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrm_fmtx_settings_api" long-name="hwrm_fmtx_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrm_fmtx_state_api" long-name="hwrm_fmtx_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hw_resource_blocking_api" long-name="hw_resource_blocking_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_blocking_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hw_resource_manager_plugin_api" long-name="hw_resource_manager_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_manager_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hw_settings_api" long-name="hw_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="isc_api" long-name="isc_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/isc_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lights_commands_api" long-name="lights_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/lights_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="light_settings_api" long-name="light_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/light_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_command_initiator_api" long-name="mediator_command_initiator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_command_responder_api" long-name="mediator_command_responder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_domain_definitions_api" long-name="mediator_domain_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_event_consumer_api" long-name="mediator_event_consumer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_event_provider_api" long-name="mediator_event_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_notification_api" long-name="mediator_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_plugin_api" long-name="mediator_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediator_static_registration_api" long-name="mediator_static_registration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="powersave_api" long-name="powersave_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="powersave_definitions_api" long-name="powersave_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="powersave_plugin_api" long-name="powersave_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="power_state_plugin_api" long-name="power_state_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/power_state_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remote_control_extension_api" long-name="remote_control_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sae_api" long-name="sae_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="security_notification_api" long-name="security_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/security_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_channel_filter_api" long-name="sensor_channel_filter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_data_compensator_plugin_api" long-name="sensor_data_compensator_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_extension_api" long-name="sensor_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_plugin_api" long-name="sensor_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shared_data_api" long-name="shared_data_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sim_utils_api" long-name="sim_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/sim_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startup_adaptation_api" long-name="startup_adaptation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/startup_adaptation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startup_reason_api" long-name="startup_reason_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/startup_reason_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startup_status_api" long-name="startup_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/startup_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="string_resource_reader_api" long-name="string_resource_reader_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/string_resource_reader_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syslangutil_api" long-name="syslangutil_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_startup_control_api" long-name="system_startup_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_startup_extension_plugin_api" long-name="system_startup_extension_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_state_control_api" long-name="system_state_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/system_state_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="target_modifier_plugin_api" long-name="target_modifier_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/target_modifier_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tiltcompensation_api" long-name="tiltcompensation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tspclientmapper_api" long-name="tspclientmapper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tv_out_config_api" long-name="tv_out_config_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vibra_commands_api" long-name="vibra_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/vibra_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wakeup_alarm_api" long-name="wakeup_alarm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devicesrv_pub" long-name="devicesrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessory_monitoring_api" long-name="accessory_monitoring_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="central_repository_notification_handler_api" long-name="central_repository_notification_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/central_repository_notification_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_platform_security_definitions_api" long-name="common_platform_security_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cone_resource_loader_api" long-name="cone_resource_loader_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/cone_resource_loader_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="feature_discovery_api" long-name="feature_discovery_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="find_item_api" long-name="find_item_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicesrv_pub" long-name="devicesrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="haptics_api" long-name="haptics_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrm_power_state_api" long-name="hwrm_power_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="light_api" long-name="light_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/light_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_parser_api" long-name="phone_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="platform_environment_api" long-name="platform_environment_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="platform_path_definitions_api" long-name="platform_path_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_channel_api" long-name="sensor_channel_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_data_compensator_api" long-name="sensor_data_compensator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_definitions_api" long-name="sensor_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="string_loader_api" long-name="string_loader_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/string_loader_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sysutil_api" long-name="sysutil_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="text_resolver_api" long-name="text_resolver_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="version_info_api" long-name="version_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vibra_api" long-name="vibra_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vibra_settings_api" long-name="vibra_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/devicesrv/devicesrv_pub/vibra_settings_api/group"/>
      </component>
     </collection>
    </block>
    <block long-name="Locating Services" level="services" name="lbs" levels="hw-if data-acquisition adaptation management application-interface">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="lbs" long-name="lbs">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lbs" long-name="lbs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/lbs/group"/>
      </component>
     </collection>
     <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
      <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
      </component>
     </collection>
     <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
      <component name="agpsintegrationmodule" long-name="A-GPS Integration Module" plugin="Y" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
      </component>
      <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
      </component>
      <component name="defaultpositioningmodule" long-name="Default Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
      </component>
      <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
      </component>
      <component name="locationbtgpspsy" long-name="BT GPS PSY">
-      <unit bldFile="os/lbs/datasourcemodules/locationbtgpspsy/group"/>
      </component>
      <component name="locationnpppsy" long-name="Location NPP PSY">
-      <unit bldFile="os/lbs/datasourcemodules/locationnpppsy/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
      </component>
      <component name="locationsuplpsy" long-name="Location SUPL PSY">
-      <unit bldFile="os/lbs/datasourcemodules/locationsuplpsy/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
      </component>
     </collection>
     <collection name="locationmgmt" long-name="Location Management" level="management">
      <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
      </component>
      <component name="locationcore" long-name="Location Core" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
      </component>
      <component name="networkgateway" long-name="Network Gateway" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
      </component>
      <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
      </component>
     </collection>
     <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
      <component name="locationserver" long-name="Location Server" introduced="9.2">
-      <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
      </component>
      <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
      </component>
     </collection>
     <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
      <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
      </component>
      <component name="suplprotocolmodule" long-name="SUPL Protocol Module" plugin="Y" introduced="tb91" deprecated="tb91">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
      </component>
     </collection>
     <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
@@ -1780,43 +1853,70 @@
       <unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
      </component>
      <component name="locationprotocoltest" long-name="Location Protocol Tests" plugin="Y" introduced="9.2">
-      <unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
      </component>
     </collection>
    </block>
    <block long-name="Communications Framework" level="services" name="commsfw" levels="server support  framework process app-if">
     <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
      <component name="refcpr" long-name="Reference CPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
      </component>
      <component name="refscpr" long-name="Reference SCPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
      </component>
     </collection>
     <collection name="commsconfig" long-name="Comms Config" level="process">
      <component name="commsdatabase" long-name="Comms Database">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
      </component>
      <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1">
-      <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cscapplicationui" long-name="cscapplicationui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cscengine" long-name="cscengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cscgsplugin" long-name="cscgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cscsettingsui" long-name="cscsettingsui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cscsipvoipcleanupplugin" long-name="cscsipvoipcleanupplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commsconfig" long-name="commsconfig">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/commsconfig/group"/>
      </component>
     </collection>
     <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
      <component name="commfw" long-name="Comms Framework" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
      </component>
      <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
      </component>
     </collection>
     <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
@@ -1824,15 +1924,18 @@
       <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
      </component>
      <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" class="PC">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
      </component>
      <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" class="config PC">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
      </component>
     </collection>
     <collection name="commsprocess" long-name="Comms Process" level="process">
      <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
      </component>
      <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" class="config">
       <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
@@ -1843,40 +1946,47 @@
     </collection>
     <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
      <component name="esockserver" long-name="ESock Server">
-      <unit version="2" bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
-      <unit version="3" bldFile="os/unref/orphan/comgen/comms-infras/esock/group" mrp="os/unref/orphan/comgen/comms-infras/esock/group/comms-infras_esock.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="3" bldFile="os/unref/orphan/comgen/comms-infras/esock/group" mrp="os/unref/orphan/comgen/comms-infras/esock/group/comms-infras_esock.mrp"/>
      </component>
      <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" class="config">
       <unit version="2" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp"/>
       <unit version="3" mrp="os/unref/orphan/comgen/comms-infras/esock/group/comms-infras_esock-config.mrp"/>
      </component>
      <component name="networkcontroller" long-name="Network Controller" plugin="Y" introduced="7.0s">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
      </component>
      <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U">
-      <unit version="1" bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
-      <unit version="2" bldFile="os/unref/orphan/comgen/comms-infras/nifman/group" mrp="os/unref/orphan/comgen/comms-infras/nifman/group/comms-infras_nifman.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="os/unref/orphan/comgen/comms-infras/nifman/group" mrp="os/unref/orphan/comgen/comms-infras/nifman/group/comms-infras_nifman.mrp"/>
      </component>
      <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
      </component>
      <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
      </component>
     </collection>
     <collection name="serialserver" long-name="Serial Server" level="server">
      <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5">
-      <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
      </component>
      <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" class="config">
-      <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
      </component>
      <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation">
       <unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
      </component>
      <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" class="test">
-      <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
      </component>
      <component name="serialportcsy" long-name="Serial Port CSY" class="placeholder" plugin="Y" introduced="ER5">
       <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
@@ -1889,26 +1999,28 @@
     </collection>
     <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
      <component name="commselements" long-name="Comms Elements" introduced="8.0">
-      <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
      </component>
     </collection>
    </block>
    <block long-name="Networking Services" level="services" name="networkingsrv" levels="adaptation hw-if plugin framework server app-if">
     <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
      <component name="internetsockets" long-name="Internet Sockets" introduced="ER5">
-      <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
      </component>
     </collection>
     <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
      <component name="nullagt" long-name="NULL AGT" plugin="Y" introduced="7.0s">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
      </component>
     </collection>
     <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
      <component name="ethernetnif" long-name="Ethernet NIF" plugin="Y">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
      </component>
      <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" plugin="Y" introduced="7.0">
       <unit mrp="os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
@@ -1918,68 +2030,77 @@
       <unit version="2" mrp="os/unref/orphan/comgen/networking/ppp/group/networking_ppp-config.mrp"/>
      </component>
      <component name="pppnif" long-name="PPP NIF" plugin="Y" introduced="ER5">
-      <unit version="1" bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
-      <unit version="2" bldFile="os/unref/orphan/comgen/networking/ppp/group" mrp="os/unref/orphan/comgen/networking/ppp/group/networking_ppp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="os/unref/orphan/comgen/networking/ppp/group" mrp="os/unref/orphan/comgen/networking/ppp/group/networking_ppp.mrp"/>
      </component>
      <component name="slipnif" long-name="SLIP NIF" plugin="Y">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
      </component>
      <component name="tunnelnif" long-name="Tunnel NIF" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
      </component>
     </collection>
     <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
      <component name="packetlogger" long-name="Packet Logger" introduced="8.1" class="test">
-      <unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
      </component>
     </collection>
     <collection name="networkcontrol" long-name="Network Control" level="plugin">
      <component name="ipcpr" long-name="IP CPR" plugin="Y" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
      </component>
      <component name="ipcprshim" long-name="IP CPR Shim" plugin="Y" deprecated="Future">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
      </component>
      <component name="ipnetworklayer" long-name="IP Network Layer" plugin="Y" introduced="tb92">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
      </component>
      <component name="ipscpr" long-name="IP SCPR" plugin="Y" introduced="9.1">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
      </component>
      <component name="iptransportlayer" long-name="IP Transport Layer" plugin="Y">
-      <unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
      </component>
      <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
      </component>
      <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" class="config">
       <unit mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
      </component>
      <component name="qosfwprt" long-name="QoS Framework PRT" plugin="Y" introduced="7.0s">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
      </component>
      <component name="qosipscpr" long-name="QoS IP SCPR" plugin="Y">
-      <unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
      </component>
      <component name="qoslib" long-name="QoS Library" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
      </component>
     </collection>
     <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
      <component name="ipeventnotifier" long-name="IP Event Notifier" plugin="Y" introduced="8.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
      </component>
      <component name="iphook" long-name="IP Hook" introduced="7.0">
-      <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
      </component>
      <component name="mobileip" long-name="Mobile IP" plugin="Y" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
      </component>
      <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" plugin="Y" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
      </component>
      <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" class="config">
       <unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
@@ -1987,16 +2108,16 @@
     </collection>
     <collection name="networksecurity" long-name="Network Security" level="framework">
      <component name="ipsec" long-name="IPsec" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
      </component>
      <component name="tls" long-name="TLS" introduced="6.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
      </component>
      <component name="tlsprovider" long-name="TLS Provider" introduced="8.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
      </component>
     </collection>
     <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
@@ -2013,12 +2134,12 @@
       <unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
      </component>
      <component name="networkingexamples" long-name="Networking Examples" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
      </component>
      <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
      </component>
      <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" class="test">
       <unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
@@ -2026,16 +2147,18 @@
     </collection>
     <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
      <component name="predictorcompression" long-name="Predictor Compression" plugin="Y" introduced="6.0">
-      <unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
      </component>
     </collection>
     <collection name="commsdb" long-name="Comms DB" level="server">
      <component name="s60_commsdb" long-name="S60 Commsdb">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commsdb" long-name="commsdb">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/networkingsrv/commsdb/group"/>
      </component>
     </collection>
@@ -2045,31 +2168,30 @@
      </component>
      <component name="networkingrom" long-name="Networking ROM">
       <!--  production component: contains the IBY files -->
-      <unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
      </component>
     </collection>
     <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
      <component name="dhcp" long-name="DHCP" introduced="8.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
      </component>
      <component name="dnd" long-name="DND" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
      </component>
      <component name="dndconfig" long-name="DND Config" introduced="7.0" class="config">
       <unit mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
      </component>
      <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" plugin="Y" introduced="tb91">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/> -->
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="networkingsrv" long-name="networkingsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkingsrv" long-name="networkingsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/networkingsrv/group"/>
      </component>
     </collection>
@@ -2077,150 +2199,154 @@
    <block long-name="WLAN" level="services" name="wlan" levels="hw 1 mid 3 tools test">
     <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
      <component name="wlanagent" long-name="WLAN Agent">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
      </component>
      <component name="wlandbif_cd" long-name="WLAN CommsDat interface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
      </component>
      <component name="wlanengine" long-name="WLAN Engine">
-      <unit bldFile="os/wlan/wlan_bearer/wlanengine/group"/>
      </component>
      <component name="wlanldd" long-name="WLAN LDD">
-      <unit bldFile="os/wlan/wlan_bearer/wlanldd/group"/>
      </component>
      <component name="wlannwif" long-name="WLAN Network Interface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
      </component>
      <component name="wlanpsmplugin" long-name="WLAN PSM Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_bearer" long-name="wlan_bearer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlanengine_symbian_3.1" long-name="wlanengine_symbian_3.1">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wpx"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlanldd_symbian" long-name="wlanldd_symbian">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
      </component>
     </collection>
     <collection name="wlantools" long-name="WLAN Tools" level="tools">
      <component name="dut" long-name="Dut">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlantools/dut/group"/>
      </component>
      <component name="ping" long-name="Ping">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlantools/ping/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlantools" long-name="wlantools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlantools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="wlan" long-name="wlan">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan" long-name="wlan">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="wlan_plat" long-name="wlan_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_plat" long-name="wlan_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_agent_hotspot_plugin_api" long-name="wlan_agent_hotspot_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_control_api" long-name="wlan_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_dbif_api" long-name="wlan_dbif_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_device_settings_api" long-name="wlan_device_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_eapol_plugin_api" long-name="wlan_eapol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_generic_plugin_api" long-name="wlan_generic_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_hal_api" long-name="wlan_hal_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_hpa_api" long-name="wlan_hpa_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_hw_initialization_data_api" long-name="wlan_hw_initialization_data_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_info_api" long-name="wlan_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_management_api" long-name="wlan_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_osa_api" long-name="wlan_osa_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_power_save_plugin_api" long-name="wlan_power_save_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_spia_api" long-name="wlan_spia_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="wlan_pub" long-name="wlan_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_pub" long-name="wlan_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_sdk_info_api" long-name="wlan_sdk_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
      </component>
     </collection>
@@ -2228,138 +2354,144 @@
    <block long-name="Cellular Baseband Services" level="services" name="cellularsrv" levels="adaptation hw-if plugin framework server app-if">
     <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
      <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" plugin="Y" introduced="8.1">
-      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
      </component>
      <component name="basebandchanneladaptorforisc" long-name="Baseband Channel Adaptor for ISC" plugin="Y">
-      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforisc/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforisc/group/networking_bcatoisc.mrp"/>
      </component>
     </collection>
     <collection name="fax" long-name="Fax" level="server">
      <component name="faxclientandserver" long-name="Fax Client and Server">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
      </component>
     </collection>
     <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
      <component name="mocksy" long-name="MockSY" introduced="tb91" plugin="Y">
-      <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
      </component>
     </collection>
     <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
      <component name="cdmasmsstack" long-name="CDMA SMS Stack" plugin="Y" introduced="8.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
      </component>
      <component name="smsstack" long-name="SMS Stack" plugin="Y" introduced="6.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
      </component>
     </collection>
     <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
      <component name="csdagt" long-name="CSD AGT" plugin="Y" introduced="6.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
      </component>
      <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
      </component>
      <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
      </component>
      <component name="pdplayer" long-name="PDP Layer" plugin="Y" introduced="tb92">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
      </component>
      <component name="psdagt" long-name="PSD AGT" plugin="Y" introduced="7.0s">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
      </component>
      <component name="qos3gppcpr" long-name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
      </component>
      <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
      </component>
      <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
      </component>
      <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
      </component>
      <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" plugin="Y" introduced="8.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
      </component>
     </collection>
     <collection name="telephonyreferenceplat" long-name="Telephony Reference Platform" level="plugin"/>
     <collection name="telephonyserver" long-name="Telephony Server" level="server">
      <component name="etelcdma" long-name="ETel CDMA" introduced="7.0s">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
      </component>
      <component name="etelconfig" long-name="ETel Config">
       <unit mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
      </component>
      <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
      </component>
      <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
      </component>
      <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
      </component>
      <component name="etelserverandcore" long-name="ETel Server and Core">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
      </component>
     </collection>
     <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
      <component name="cdmatsy" long-name="CDMA TSY" plugin="Y" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
      </component>
      <component name="common_tsy" long-name="Common TSY" introduced="tb92">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
      </component>
      <component name="multimodetsy" long-name="Multimode TSY" plugin="Y">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
      </component>
      <component name="simtsy" long-name="SIM TSY" plugin="Y" introduced="7.0" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
      </component>
     </collection>
     <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
      <component name="dial" long-name="Dial" deprecated="9.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
      </component>
      <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
      </component>
      <component name="telephonywatchers" long-name="Telephony Watchers" plugin="Y" introduced="6.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
      </component>
     </collection>
     <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
      <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1">
-      <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
      </component>
      <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92">
-      <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
      </component>
      <component name="isc_if" long-name="ISC Interface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="basebandabstraction" long-name="basebandabstraction">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/basebandabstraction/group"/>
      </component>
     </collection>
@@ -2373,133 +2505,130 @@
     </collection>
     <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
      <component name="gennif" long-name="Generic NIF">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/>
      </component>
      <component name="gprsumtsagent" long-name="GPRS UMTS Agent">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonnetworkinterface" long-name="commonnetworkinterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commonnetworkinterface/group"/>
      </component>
     </collection>
     <collection name="commontsy" long-name="Common TSY" level="hw-if">
      <component name="ctsy" long-name="CTSY">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commontsy/ctsy/group"/>
      </component>
      <component name="customapi" long-name="Custom API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commontsy/customapi/group"/>
      </component>
      <component name="phonetsy" long-name="Phone TSY">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commontsy/phonetsy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commontsy" long-name="commontsy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/commontsy/group"/>
      </component>
     </collection>
     <collection name="dataporttesttool" long-name="Dataport Test Tool" level="plugin">
      <component name="DPS_Test_client" long-name="DPS Test Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/dataporttesttool/DPS_Test_client/group"/>
      </component>
      <component name="dps_test.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="dataporttesttool" long-name="dataporttesttool">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/dataporttesttool/group"/>
      </component>
     </collection>
     <collection name="stif_tsy_test_tool" long-name="STIF TSY Test Tool" level="app-if">
      <component name="CAP">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/CAP/group"/>
      </component>
      <component name="CC">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/CC/group"/>
      </component>
      <component name="Core">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Core/group"/>
      </component>
      <component name="Eminfo" long-name="EM Info">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Eminfo/group"/>
      </component>
      <component name="NWE">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/NWE/group"/>
      </component>
      <component name="Notify">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Notify/group"/>
      </component>
      <component name="SEC">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SEC/group"/>
      </component>
      <component name="SIM">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SIM/group"/>
      </component>
      <component name="SMS">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SMS/group"/>
      </component>
      <component name="SupplementaryService" long-name="Supplementary Service">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SupplementaryService/group"/>
      </component>
      <component name="USSD">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/USSD/group"/>
      </component>
      <component name="Voice">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Voice/group"/>
      </component>
      <component name="VoiceCore" long-name="Voice Core">
-      <unit bldFile="os/cellularsrv/stif_tsy_test_tool/VoiceCore/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="cellularsrv" long-name="cellularsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cellularsrv" long-name="cellularsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="cellularsrv_plat" long-name="cellularsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_tsy_plugin_api" long-name="common_tsy_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/common_tsy_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_tsy_service_api" long-name="common_tsy_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/common_tsy_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cellularsrv_plat" long-name="cellularsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="licenseetsy_lib" long-name="licenseetsy_lib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/licenseetsy_lib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimode_etel_custom_api" long-name="multimode_etel_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/multimode_etel_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="primary_pdp_context_qos_parameter_setting_api" long-name="primary_pdp_context_qos_parameter_setting_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/primary_pdp_context_qos_parameter_setting_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tsy_names" long-name="tsy_names">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/cellularsrv_plat/tsy_names/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="tsytesttool" long-name="tsytesttool">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tsytesttool" long-name="tsytesttool">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/cellularsrv/tsytesttool/group"/>
      </component>
     </collection>
@@ -2507,7 +2636,8 @@
    <block long-name="Short Link Services" level="services" name="shortlinksrv" levels="adaptation hw-if plugin framework server app-if">
     <collection name="bluetooth" long-name="Bluetooth" level="framework">
      <component name="btcomm" long-name="Bluetooth CSY" plugin="Y" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
      </component>
      <component name="btdocs" long-name="Bluetooth Documentation" class="doc">
       <unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
@@ -2516,19 +2646,24 @@
       <unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
      </component>
      <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
      </component>
      <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" class="test">
-      <unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
      </component>
      <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
      </component>
      <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
      </component>
      <component name="btstack" long-name="Bluetooth Stack" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
      </component>
     </collection>
     <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
@@ -2536,7 +2671,8 @@
     </collection>
     <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
      <component name="btpan" long-name="Bluetooth PAN Profile" plugin="Y" introduced="8.1">
-      <unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
      </component>
     </collection>
     <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
@@ -2544,42 +2680,47 @@
       <unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
      </component>
      <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
      </component>
      <component name="btconfig" long-name="Bluetooth Config" class="config">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btconfig" mrp="os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
      </component>
      <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
      </component>
      <component name="btrom" long-name="Bluetooth ROM" introduced="9.1">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
      </component>
     </collection>
     <collection name="bthci" long-name="Host Controller Interface" level="server">
      <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" plugin="Y" introduced="9.2">
-      <unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
      </component>
      <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
      </component>
      <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
      </component>
      <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2">
-      <unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
      </component>
     </collection>
     <collection name="irda" long-name="IrDA" level="plugin">
      <component name="irdaconfig" long-name="IrDA Config" introduced="6.0" class="config">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/shortlinksrv/irda/irdaconfig" mrp="os/shortlinksrv/irda/irdaconfig/infra-red_config.mrp"/> -->
      </component>
      <component name="irdadocs" long-name="IrDA Documentation" class="doc">
       <unit mrp="os/shortlinksrv/irda/irdadocs/infra-red_documentation.mrp"/>
      </component>
      <component name="irdastack" long-name="IrDA Stack">
-      <unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
      </component>
      <component name="irdatest" long-name="IrDA Test" introduced="9.2" class="test">
       <unit mrp="os/shortlinksrv/irda/irdatest/group/infra-red_irda_test.mrp"/>
@@ -2587,7 +2728,8 @@
     </collection>
     <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
      <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
      </component>
     </collection>
     <collection name="usbmgmt" long-name="USB Management" level="server">
@@ -2595,8 +2737,10 @@
       <unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
      </component>
      <component name="usbmgr" long-name="USB Manager">
-      <unit version="1" bldFile="os/unref/orphan/comgen/ser-comms/usb/group" mrp="os/unref/orphan/comgen/ser-comms/usb/group/ser-comms_usb.mrp"/>
-      <unit version="2" bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="os/unref/orphan/comgen/ser-comms/usb/group" mrp="os/unref/orphan/comgen/ser-comms/usb/group/ser-comms_usb.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp"/>
      </component>
      <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" class="test">
       <unit version="1" mrp="os/unref/orphan/comgen/ser-comms/usb_test/group/ser-comms_usb_test.mrp"/>
@@ -2604,29 +2748,29 @@
      </component>
     </collection>
     <collection name="usbbsptemplate" long-name="USB BSP Template" level="adaptation"/>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="shortlinksrv" long-name="shortlinksrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinksrv" long-name="shortlinksrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/shortlinksrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="shortlinksrv_plat" long-name="shortlinksrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_audio_adaptation_api" long-name="bluetooth_audio_adaptation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_audio_adaptation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_power_management_api" long-name="bluetooth_power_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_power_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinksrv_plat" long-name="shortlinksrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
      </component>
     </collection>
@@ -2634,13 +2778,15 @@
    <block long-name="Multimedia" level="services" name="mm" levels="adaptation hw-if device-fw devices middleware app-if">
     <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
      <component name="camerafw" long-name="Camera Framework" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/camerafw/framework/group" mrp="os/mm/imagingandcamerafws/camerafw/framework/group/multimedia_ecam_framework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/imagingandcamerafws/camerafw/framework/group" mrp="os/mm/imagingandcamerafws/camerafw/framework/group/multimedia_ecam_framework.mrp"/>
      </component>
      <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" class="test">
       <unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
      </component>
      <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
      </component>
      <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" class="test">
       <unit mrp="os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
@@ -2658,56 +2804,65 @@
       <unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
      </component>
      <component name="mdf" long-name="Media Device Framework" introduced="9.2">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/> -->
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp4/audio/mdf"/>
      </component>
      <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
      </component>
     </collection>
     <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
      <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
      </component>
      <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
      </component>
      <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
      </component>
      <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
      </component>
      <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb92" class="test">
       <unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
      </component>
      <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
      </component>
      <component name="videohai" long-name="Video HAI" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group/multimedia_mdf_devvideo.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group/multimedia_mdf_devvideo.mrp"/>
      </component>
     </collection>
     <collection name="mmhostprocess" long-name="Multimedia Host Process" level="devices"/>
     <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
      <component name="3gplib" long-name="3GP Library" introduced="Future">
-      <unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
      </component>
      <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" class="test">
       <unit mrp="os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
      </component>
      <component name="cameraplugins" long-name="Camera Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/camerafw/plugins/group" mrp="os/mm/imagingandcamerafws/camerafw/plugins/group/multimedia_ecam_plugins.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/imagingandcamerafws/camerafw/plugins/group" mrp="os/mm/imagingandcamerafws/camerafw/plugins/group/multimedia_ecam_plugins.mrp"/>
      </component>
      <component name="imagingplugins" long-name="Imaging Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
      </component>
     </collection>
     <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
      <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92">
-      <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
      </component>
     </collection>
     <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation"/>
@@ -2727,743 +2882,762 @@
     </collection>
     <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
      <component name="openmax" long-name="OpenMAX" introduced="tb91">
-      <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
      </component>
     </collection>
     <collection name="devsound" long-name="Sound Device" level="devices">
      <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
      </component>
      <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" class="test">
       <unit mrp="os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
      </component>
      <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
      </component>
      <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92">
       <unit mrp="os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
      </component>
      <component name="a3fsrvstart" long-name="A3F Server Start" plugin="Y" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
      </component>
      <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
      </component>
      <component name="btdevsound" long-name="Bluetooth DevSound Plugin" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
      </component>
      <component name="devsoundapi" long-name="DevSound API" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
      </component>
      <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
      </component>
      <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
      </component>
     </collection>
     <collection name="codecs" long-name="Codecs" level="middleware">
      <component name="audio" long-name="Audio">
-      <unit bldFile="os/mm/codecs/audio/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/dtdriver/decoder/audio"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/group"/>
      </component>
      <component name="codecs_dom" long-name="Codecs DOM">
-      <unit bldFile="os/mm/codecs/codecs_dom/group"/>
      </component>
      <component name="video" long-name="Video">
-      <unit bldFile="os/mm/codecs/video/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/dtdriver/decoder/video"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/plugins/video/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/group"/>
      </component>
     </collection>
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
      <component name="addeddevsoundcontrol" long-name="Added DevSound Control">
-      <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/Group"/>
      </component>
      <component name="audiorouting" long-name="Audio Routing">
-      <unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/audiorouting/Group"/>
      </component>
      <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
      </component>
      <component name="drmaudioplayer" long-name="DRM Audio Player">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
      </component>
      <component name="effects" long-name="Effects">
-      <unit bldFile="os/mm/devsoundextensions/effects/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/effects/Group"/>
      </component>
      <component name="effectspresets" long-name="Effects Presets">
-      <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/effectspresets/Group"/>
      </component>
      <component name="globalaudiosettings" long-name="Global Audio Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
      </component>
      <component name="mmextfw" long-name="MM Ext Framework">
-      <unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/mmextfw/Group"/>
      </component>
      <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces">
-      <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/Group"/>
      </component>
      <component name="mmfdevsoundserverplatsec" long-name="MMF DevSound Server PlatSec">
-      <unit bldFile="os/mm/devsoundextensions/mmfdevsoundserverplatsec/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/mmfdevsoundserverplatsec/Group"/>
      </component>
      <component name="restrictedaudiooutput" long-name="Restricted Audio Output">
-      <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/Group"/>
      </component>
      <component name="telephonyaudiorouting" long-name="Telephony Audio Routing">
-      <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AddedDevSoundControlMsgHdlr" long-name="AddedDevSoundControlMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/AddedDevSoundControlMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AddedDevSoundControlProxy" long-name="AddedDevSoundControlProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/AddedDevSoundControlProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioInputBase" long-name="AudioInputBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Input/AudioInputBase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioInputMessageHandler" long-name="AudioInputMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Input/AudioInputMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioInputProxy" long-name="AudioInputProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Input/AudioInputProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Input" long-name="Input">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Input/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioOutputBase" long-name="AudioOutputBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Output/AudioOutputBase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioOutputMessageHandler" long-name="AudioOutputMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Output/AudioOutputMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioOutputProxy" long-name="AudioOutputProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Output/AudioOutputProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Output" long-name="Output">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/audiorouting/Output/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ciextnclientplugin" long-name="ciextnclientplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/ciextnclientplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ciextnserverplugin" long-name="ciextnserverplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/ciextnserverplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ciplatformfactoryplugin" long-name="ciplatformfactoryplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/ciplatformfactoryplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ciplatformmsghndlrplugin" long-name="ciplatformmsghndlrplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/ciplatformmsghndlrplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DRMPlayServer" long-name="DRMPlayServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/DRMPlayServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DRMPlayUtility" long-name="DRMPlayUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/DRMPlayUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioEqualizerEffect" long-name="AudioEqualizerEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/AudioEqualizer/AudioEqualizerEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioEqualizerMessageHandler" long-name="AudioEqualizerMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/AudioEqualizer/AudioEqualizerMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioEqualizerProxy" long-name="AudioEqualizerProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/AudioEqualizer/AudioEqualizerProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BassBoostEffect" long-name="BassBoostEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/BassBoost/BassBoostEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BassBoostMessageHandler" long-name="BassBoostMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/BassBoost/BassBoostMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BassBoostProxy" long-name="BassBoostProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/BassBoost/BassBoostProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DistanceAttenuationEffect" long-name="DistanceAttenuationEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/DistAtten/DistanceAttenuationEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DistanceAttenuationMessageHandler" long-name="DistanceAttenuationMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/DistAtten/DistanceAttenuationMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DistanceAttenuationProxy" long-name="DistanceAttenuationProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/DistAtten/DistanceAttenuationProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DopplerBase" long-name="DopplerBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/DopplerBase/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EffectBase" long-name="EffectBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/EffectBase/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EffectTest" long-name="EffectTest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/EffectTest"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EnvironmentalReverbEffect" long-name="EnvironmentalReverbEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/EnvReverb/EnvironmentalReverbEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EnvironmentalReverbMessageHandler" long-name="EnvironmentalReverbMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/EnvReverb/EnvironmentalReverbMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EnvironmentalReverbProxy" long-name="EnvironmentalReverbProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/EnvReverb/EnvironmentalReverbProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerDopplerEffect" long-name="ListenerDopplerEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListDoppler/ListenerDopplerEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerDopplerMessageHandler" long-name="ListenerDopplerMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListDoppler/ListenerDopplerMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerDopplerProxy" long-name="ListenerDopplerProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListDoppler/ListenerDopplerProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerLocationEffect" long-name="ListenerLocationEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListLocation/ListenerLocationEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerLocationMessageHandler" long-name="ListenerLocationMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListLocation/ListenerLocationMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerLocationProxy" long-name="ListenerLocationProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListLocation/ListenerLocationProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerOrientationEffect" long-name="ListenerOrientationEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListOrient/ListenerOrientationEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerOrientationMessageHandler" long-name="ListenerOrientationMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListOrient/ListenerOrientationMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ListenerOrientationProxy" long-name="ListenerOrientationProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/ListOrient/ListenerOrientationProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LocationBase" long-name="LocationBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/LocationBase/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LoudnessEffect" long-name="LoudnessEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/Loudness/LoudnessEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LoudnessMessageHandler" long-name="LoudnessMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/Loudness/LoudnessMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LoudnessProxy" long-name="LoudnessProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/Loudness/LoudnessProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OrientationBase" long-name="OrientationBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/OrientationBase/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RoomLevelEffect" long-name="RoomLevelEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/RoomLevel/RoomLevelEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RoomLevelMessageHandler" long-name="RoomLevelMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/RoomLevel/RoomLevelMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RoomLevelProxy" long-name="RoomLevelProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/RoomLevel/RoomLevelProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceDopplerEffect" long-name="SourceDopplerEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcDoppler/SourceDopplerEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceDopplerMessageHandler" long-name="SourceDopplerMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcDoppler/SourceDopplerMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceDopplerProxy" long-name="SourceDopplerProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcDoppler/SourceDopplerProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceLocationEffect" long-name="SourceLocationEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcLocation/SourceLocationEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceLocationMessageHandler" long-name="SourceLocationMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcLocation/SourceLocationMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceLocationProxy" long-name="SourceLocationProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcLocation/SourceLocationProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceOrientationEffect" long-name="SourceOrientationEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcOrientation/SourceOrientationEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceOrientationMessageHandler" long-name="SourceOrientationMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcOrientation/SourceOrientationMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SourceOrientationProxy" long-name="SourceOrientationProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/SrcOrientation/SourceOrientationProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StereoWideningEffect" long-name="StereoWideningEffect">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/StereoWidening/StereoWideningEffect/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StereoWideningMessageHandler" long-name="StereoWideningMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/StereoWidening/StereoWideningMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StereoWideningProxy" long-name="StereoWideningProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effects/StereoWidening/StereoWideningProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioEqualizerUtility" long-name="AudioEqualizerUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EnvironmentalReverbUtility" long-name="EnvironmentalReverbUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StereoWideningUtility" long-name="StereoWideningUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devsoundextensions" long-name="devsoundextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="customcommandutility" long-name="customcommandutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmextfw/customcommandutility/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CustomInterfaceBuilder" long-name="CustomInterfaceBuilder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmextfw/custominterfaceutility/CustomInterfaceBuilder/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CustomInterfaceUtility" long-name="CustomInterfaceUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmextfw/custominterfaceutility/CustomInterfaceUtility/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custominterfaceutility" long-name="custominterfaceutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmextfw/custominterfaceutility/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AacDecoderConfig" long-name="AacDecoderConfig">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AacDecoderConfig/AacDecoderConfig/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AacDecoderConfig/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AacDecoderConfigMsgHdlr" long-name="AacDecoderConfigMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AacDecoderConfig/AacDecoderConfigMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AacDecoderConfigProxy" long-name="AacDecoderConfigProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AacDecoderConfig/AacDecoderConfigProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioVibraControl" long-name="AudioVibraControl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AudioVibraControl/AudioVibraControl/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AudioVibraControl/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioVibraControlMsgHdlr" long-name="AudioVibraControlMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AudioVibraControl/AudioVibraControlMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioVibraControlProxy" long-name="AudioVibraControlProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/AudioVibraControl/AudioVibraControlProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusDecoderIntfc" long-name="EAacPlusDecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/EAacPlusDecoderIntfc/EAacPlusDecoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/EAacPlusDecoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusDecoderIntfcMsgHdlr" long-name="EAacPlusDecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/EAacPlusDecoderIntfc/EAacPlusDecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusDecoderIntfcProxy" long-name="EAacPlusDecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/EAacPlusDecoderIntfc/EAacPlusDecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ErrorConcealmentIntfc" long-name="ErrorConcealmentIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/ErrConcealmentIntfc/ErrorConcealmentIntfc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ErrorConcealmentIntfcMsgHdlr" long-name="ErrorConcealmentIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/ErrConcealmentIntfc/ErrorConcealmentIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ErrorConcealmentIntfcProxy" long-name="ErrorConcealmentIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/ErrConcealmentIntfc/ErrorConcealmentIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ErrConcealmentIntfc" long-name="ErrConcealmentIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/ErrConcealmentIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711DecoderIntfc" long-name="G711DecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711DecoderIntfc/G711DecoderIntfc/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711DecoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711DecoderIntfcMsgHdlr" long-name="G711DecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711DecoderIntfc/G711DecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711DecoderIntfcProxy" long-name="G711DecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711DecoderIntfc/G711DecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711EncoderIntfc" long-name="G711EncoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711EncoderIntfc/G711EncoderIntfc/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711EncoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711EncoderIntfcMsgHdlr" long-name="G711EncoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711EncoderIntfc/G711EncoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G711EncoderIntfcProxy" long-name="G711EncoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G711EncoderIntfc/G711EncoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729DecoderIntfc" long-name="G729DecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729DecoderIntfc/G729DecoderIntfc/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729DecoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729DecoderIntfcMsgHdlr" long-name="G729DecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729DecoderIntfc/G729DecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729DecoderIntfcProxy" long-name="G729DecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729DecoderIntfc/G729DecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729EncoderIntfc" long-name="G729EncoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729EncoderIntfc/G729EncoderIntfc/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729EncoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729EncoderIntfcMsgHdlr" long-name="G729EncoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729EncoderIntfc/G729EncoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="G729EncoderIntfcProxy" long-name="G729EncoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/G729EncoderIntfc/G729EncoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcDecoderIntfc" long-name="IlbcDecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcDecoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcDecoderIntfc/IlbcDecoderIntfc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcDecoderIntfcMsgHdlr" long-name="IlbcDecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcDecoderIntfc/IlbcDecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcDecoderIntfcProxy" long-name="IlbcDecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcDecoderIntfc/IlbcDecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcEncoderIntfc" long-name="IlbcEncoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcEncoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcEncoderIntfc/IlbcEncoderIntfc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcEncoderIntfcMsgHdlr" long-name="IlbcEncoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcEncoderIntfc/IlbcEncoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IlbcEncoderIntfcProxy" long-name="IlbcEncoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/IlbcEncoderIntfc/IlbcEncoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Ra8DecoderIntfc" long-name="Ra8DecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/Ra8DecoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/Ra8DecoderIntfc/Ra8DecoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Ra8DecoderIntfcMsgHdlr" long-name="Ra8DecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/Ra8DecoderIntfc/Ra8DecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Ra8DecoderIntfcProxy" long-name="Ra8DecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/Ra8DecoderIntfc/Ra8DecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SbcEncoderIntfc" long-name="SbcEncoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SbcEncoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SbcEncoderIntfc/SbcEncoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SbcEncoderIntfcMsgHdlr" long-name="SbcEncoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SbcEncoderIntfc/SbcEncoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SbcEncoderIntfcProxy" long-name="SbcEncoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SbcEncoderIntfc/SbcEncoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SpeechEncoderConfig" long-name="SpeechEncoderConfig">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SpeechEncoderConfig/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SpeechEncoderConfig/SpeechEncoderConfig/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SpeechEncoderConfigMsgHdlr" long-name="SpeechEncoderConfigMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SpeechEncoderConfig/SpeechEncoderConfigMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SpeechEncoderConfigProxy" long-name="SpeechEncoderConfigProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/SpeechEncoderConfig/SpeechEncoderConfigProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WmaDecoderIntfc" long-name="WmaDecoderIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WmaDecoderIntfcMsgHdlr" long-name="WmaDecoderIntfcMsgHdlr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcMsgHdlr/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WmaDecoderIntfcProxy" long-name="WmaDecoderIntfcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmfdevsoundadaptation" long-name="mmfdevsoundadaptation">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/mmfdevsoundserverplatsec/mmfdevsoundadaptation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RestrictedAudioOutputBase" long-name="RestrictedAudioOutputBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/RestrictedAudioOutputBase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RestrictedAudioOutputMessageHandler" long-name="RestrictedAudioOutputMessageHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/RestrictedAudioOutputMessageHandler/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RestrictedAudioOutputProxy" long-name="RestrictedAudioOutputProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/RestrictedAudioOutputProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Server" long-name="Server">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/Server/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Session" long-name="Session">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/Session/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TelephonyAudioRoutingBase" long-name="TelephonyAudioRoutingBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/TelephonyAudioRoutingBase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TelephonyAudioRoutingManager" long-name="TelephonyAudioRoutingManager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/TelephonyAudioRoutingManager/group"/>
      </component>
     </collection>
     <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
      <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MdfPostProcDevice" long-name="MdfPostProcDevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/PostProcessor/MdfPostProcDevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MdfPostProcProxy" long-name="MdfPostProcProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/PostProcessor/MdfPostProcProxy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PostProcessing" long-name="PostProcessing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/PostProcessor/PostProcessing/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mdfdevvideoextensions" long-name="mdfdevvideoextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mdfdevvideoextensions/group"/>
      </component>
     </collection>
@@ -3474,556 +3648,561 @@
     </collection>
     <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
      <component name="postingsurface" long-name="Posting Surface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoadaptationextensions" long-name="videoadaptationextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/videoadaptationextensions/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mm" long-name="mm">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mm" long-name="mm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="audio" long-name="audio">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AacEncoderPlugin" long-name="AacEncoderPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AacEncoderPlugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AmrNbCodecPlugin" long-name="AmrNbCodecPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AmrWbCodecPlugin" long-name="AmrWbCodecPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusCodecPlugin" long-name="EAacPlusCodecPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusUtil" long-name="EAacPlusUtil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/EAacPlusUtil/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FrameTable" long-name="FrameTable">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/FrameTable/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ARM_CMMF_codecs" long-name="ARM_CMMF_codecs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MP3CodecPlugin" long-name="MP3CodecPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/MP3CodecPlugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WMADecoderPlugin" long-name="WMADecoderPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/audio/ARM_CMMF_codecs/WMADecoderPlugin/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mm_plat" long-name="mm_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aac_decoder_config_api" long-name="aac_decoder_config_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aac_decoder_config_msg_hdlr_api" long-name="aac_decoder_config_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aac_decoder_config_proxy_api" long-name="aac_decoder_config_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="added_devsound_control_api" long-name="added_devsound_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="added_devsound_control_msg_hdlr_api" long-name="added_devsound_control_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="added_devsound_control_proxy_api" long-name="added_devsound_control_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_effects_msg_hdlr_api" long-name="audio_effects_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_effects_proxy_api" long-name="audio_effects_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_policy_header_api" long-name="audio_policy_header_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_routing_api" long-name="audio_routing_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_routing_msg_hdlr_api" long-name="audio_routing_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_routing_proxy_api" long-name="audio_routing_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_server_factory_api" long-name="audio_server_factory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_server_factory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_vibra_control_api" long-name="audio_vibra_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_vibra_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_vibra_control_msg_hdlr_api" long-name="audio_vibra_control_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_vibra_control_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_vibra_control_proxy_api" long-name="audio_vibra_control_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_vibra_control_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_visualization_api" long-name="audio_visualization_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/audio_visualization_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_interface_builder_api" long-name="custom_interface_builder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_interface_message_handler_factory_api" long-name="custom_interface_message_handler_factory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_interface_proxy_factory_api" long-name="custom_interface_proxy_factory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_interface_utility_api" long-name="custom_interface_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devsound_adaptation_api" long-name="devsound_adaptation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="display_posting_api" long-name="display_posting_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaacplusutil_api" long-name="eaacplusutil_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaac_plus_decoder_interface_api" long-name="eaac_plus_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eaac_plus_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaac_plus_decoder_interface_proxy_api" long-name="eaac_plus_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="error_concealment_interface_api" long-name="error_concealment_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="error_concealment_interface_msg_hdlr_api" long-name="error_concealment_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="error_concealment_interface_proxy_api" long-name="error_concealment_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fm_radio_adaptation_api" long-name="fm_radio_adaptation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="frametable_api" long-name="frametable_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_decoder_interface_api" long-name="g711_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_decoder_interface_msg_hdlr_api" long-name="g711_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_decoder_interface_proxy_api" long-name="g711_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_encoder_interface_api" long-name="g711_encoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_encoder_interface_msg_hdlr_api" long-name="g711_encoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711_encoder_interface_proxy_api" long-name="g711_encoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_decoder_interface_api" long-name="g729_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_decoder_interface_msg_hdlr_api" long-name="g729_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_decoder_interface_proxy_api" long-name="g729_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_encoder_interface_api" long-name="g729_encoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_encoder_interface_msg_hdlr_api" long-name="g729_encoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729_encoder_interface_proxy_api" long-name="g729_encoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="global_audio_settings_api" long-name="global_audio_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="global_audio_settings_definition_api" long-name="global_audio_settings_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mm_plat" long-name="mm_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_decoder_interface_api" long-name="ilbc_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="ilbc_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_decoder_interface_proxy_api" long-name="ilbc_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_encoder_interface_api" long-name="ilbc_encoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="ilbc_encoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbc_encoder_interface_proxy_api" long-name="ilbc_encoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mdf_plugin_uids" long-name="mdf_plugin_uids">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_fourcc_definitions_api" long-name="multimedia_fourcc_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nokia_audio_policy_header_api" long-name="nokia_audio_policy_header_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nokia_multimedia_fourcc_definitions_api" long-name="nokia_multimedia_fourcc_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ra8_decoder_interface_api" long-name="ra8_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ra8_decoder_interface_msg_hdlr_api" long-name="ra8_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ra8_decoder_interface_proxy_api" long-name="ra8_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rds_adaptation_api" long-name="rds_adaptation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restricted_audio_output_api" long-name="restricted_audio_output_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restricted_audio_output_msg_hdlr_api" long-name="restricted_audio_output_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restricted_audio_output_proxy_api" long-name="restricted_audio_output_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sbc_encoder_interface_api" long-name="sbc_encoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sbc_encoder_interface_msg_hdlr_api" long-name="sbc_encoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sbc_encoder_interface_proxy_api" long-name="sbc_encoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secure_output_mdf_custom_interface" long-name="secure_output_mdf_custom_interface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speech_encoder_config_api" long-name="speech_encoder_config_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speech_encoder_config_msg_hdlr_api" long-name="speech_encoder_config_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speech_encoder_config_proxy_api" long-name="speech_encoder_config_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_audio_routing_client_api" long-name="telephony_audio_routing_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_audio_routing_manager_api" long-name="telephony_audio_routing_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_buffer_management_mdf_custom_interface" long-name="video_buffer_management_mdf_custom_interface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_decoder_rotation_mdf_custom_interface" long-name="video_decoder_rotation_mdf_custom_interface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_decoder_scaling_mdf_custom_interface" long-name="video_decoder_scaling_mdf_custom_interface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_window_control_custom_interface" long-name="video_window_control_custom_interface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wma_decoder_interface_api" long-name="wma_decoder_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wma_decoder_interface_msg_hdlr_api" long-name="wma_decoder_interface_msg_hdlr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wma_decoder_interface_proxy_api" long-name="wma_decoder_interface_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mm_pub" long-name="mm_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_effects_api" long-name="audio_effects_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_effects_presets_api" long-name="audio_effects_presets_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_audio_player_api" long-name="drm_audio_player_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mm_pub" long-name="mm_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_extension_interfaces_api" long-name="multimedia_extension_interfaces_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="video" long-name="video">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ARM_MDF_Decoders" long-name="ARM_MDF_Decoders">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="H264Dec" long-name="H264Dec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/H264Dec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DecHwDevice" long-name="DecHwDevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/MPEG4H263Dec/DecHwDevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Mp4H263ComboCodec" long-name="Mp4H263ComboCodec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/MPEG4H263Dec/Mp4H263ComboCodec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Mp4H263Decoder" long-name="Mp4H263Decoder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/MPEG4H263Dec/Mp4H263Decoder/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BufferProcessor" long-name="BufferProcessor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/Utilities/BufferProcessor/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/utilities/BufferProcessor/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StateMachine" long-name="StateMachine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/Utilities/StateMachine/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/utilities/StateMachine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VC1Dec" long-name="VC1Dec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/VC1Dec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VC1Codec" long-name="VC1Codec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/VC1Dec/VC1Codec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VC1Decoder" long-name="VC1Decoder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/VC1Dec/VC1Decoder/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VC1HwDevice" long-name="VC1HwDevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/mm/video/ARM_MDF_Decoders/VC1Dec/VC1HwDevice/group"/>
      </component>
     </collection>
@@ -4031,98 +4210,110 @@
    <block long-name="Imaging Extensions" level="services" name="imagingext" levels="adaptation hw-if plugin framework server app-if">
     <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
      <component name="IclExtJpegApi" long-name="ICL Ext JPEG API">
-      <unit bldFile="os/imagingext/imageadaptationextensions/IclExtJpegApi/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageadaptationextensions" long-name="imageadaptationextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="iclextjpegapi" long-name="iclextjpegapi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+     </component>
     </collection>
     <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
      <component name="ExifLib" long-name="Exif Lib">
-      <unit bldFile="os/imagingext/imagingmodules/ExifLib/group"/>
      </component>
      <component name="JP2KCodec" long-name="JP2K Codec">
-      <unit bldFile="os/imagingext/imagingmodules/JP2KCodec/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="exiflib" long-name="exiflib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagingmodules" long-name="imagingmodules">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingmodules/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="H264AVCVideoEncARM" long-name="H264AVCVideoEncARM">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingmodules/H264AVCVideoEncARM/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="jp2kcodec" long-name="jp2kcodec">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Build" long-name="Build">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingmodules/VideoEncPluginARM/Build"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="H263EHWDevARM" long-name="H263EHWDevARM">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingmodules/VideoEncPluginARM/H263EHWDevARM/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imagingext" long-name="imagingext">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagingext" long-name="imagingext">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imagingext_plat" long-name="imagingext_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecam_face_tracking_custom_api" long-name="ecam_face_tracking_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecam_orientation_custom_api" long-name="ecam_orientation_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecam_ui_orientation_override_custom_api" long-name="ecam_ui_orientation_override_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_icl_jpeg_api" long-name="extended_icl_jpeg_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagingext_plat" long-name="imagingext_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="h324_annex_k_custom_api" long-name="h324_annex_k_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="jpeg2000_icl_plugin_api" long-name="jpeg2000_icl_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imagingext_pub" long-name="imagingext_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="exif_api" long-name="exif_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_pub/exif_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagingext_pub" long-name="imagingext_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/imagingext/imagingext_pub/group"/>
      </component>
     </collection>
@@ -4130,11 +4321,10 @@
    <block long-name="Graphics" level="services" name="graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection name="egl" long-name="EGL" level="internal-adaptations">
      <component name="eglimplementation" long-name="EGL Implementation" introduced="tb91">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
      </component>
      <component name="eglinterface" long-name="EGL Interface" introduced="tb91">
-      <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
      </component>
     </collection>
     <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
@@ -4142,29 +4332,28 @@
     </collection>
     <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
      <component name="compositionengineadaptation" long-name="Composition Engine Adaptation" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/compositionengineadaptation/group" mrp="os/graphics/graphicscomposition/compositionengineadaptation/group/graphics_compositionbackend.mrp"/>
      </component>
      <component name="graphicscompositionengine" long-name="Graphics Composition Engine" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/graphicscompositionengine/group" mrp="os/graphics/graphicscomposition/graphicscompositionengine/group/graphics_gce.mrp"/>
      </component>
      <component name="surfaceupdate" long-name="Surface Update" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
      <component name="bitgdi" long-name="BitGDI">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
      </component>
      <component name="colourpalette" long-name="Colour Palette" introduced="7.0s">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
      </component>
      <component name="screendriver" long-name="Screen Driver" plugin="Y" introduced="6.1">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
      </component>
     </collection>
     <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
      <component name="surfacemgr" long-name="Surface Manager" introduced="tb92">
-      <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
      </component>
     </collection>
     <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines"/>
@@ -4173,64 +4362,64 @@
       <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
      </component>
      <component name="uibench" long-name="UI Bench" introduced="9.2" class="test">
-      <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
      </component>
     </collection>
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
      <component name="bitmapfonttools" long-name="Bitmap Font Tools" class="PC">
-      <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
      </component>
      <component name="gdi_tools" long-name="GDI Tools" class="PC">
-      <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
      </component>
     </collection>
     <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
      <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92">
-      <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
      </component>
     </collection>
     <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
      <component name="openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
      </component>
      <component name="openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
      </component>
      <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0">
-      <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
      </component>
     </collection>
     <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
      <component name="openvgimplementation" long-name="OpenVG Implementation" introduced="tb91">
-      <unit bldFile="os/graphics/openvg/openvgimplementation/group/" mrp="os/graphics/openvg/openvgimplementation/group/graphics_openvg.mrp"/>
      </component>
      <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91">
-      <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
      </component>
     </collection>
     <collection name="printingservices" long-name="Printing Services" level="app-if">
      <component name="printerdriversupport" long-name="Printer Driver Support">
-      <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
      </component>
      <component name="printerdrivers" long-name="Printer Drivers" plugin="Y">
-      <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
      </component>
     </collection>
     <collection name="windowing" long-name="Windowing" level="app-if">
      <component name="windowserver" long-name="Window Server">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
      </component>
     </collection>
     <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
      <component name="fontandbitmapserver" long-name="Font and Bitmap Server">
-      <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
      </component>
      <component name="itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" plugin="Y" introduced="tb92">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
      </component>
     </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
@@ -4240,66 +4429,70 @@
     </collection>
     <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
      <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphicsaccelaration/2D_OpenVG_1_0/group"/>
      </component>
      <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphicsaccelaration/3d_opengl_es_1_1/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphicsaccelaration" long-name="graphicsaccelaration">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphicsaccelaration/group"/>
      </component>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
      <component name="m3gapi">
-      <unit bldFile="os/graphics/m3g/m3gapi/group"/>
      </component>
      <component name="m3gcore11">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="m3g" long-name="m3g">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/m3g/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="graphics" long-name="graphics">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics" long-name="graphics">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/graphics/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="graphics_plat" long-name="graphics_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics_plat" long-name="graphics_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphics_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="m3g_core_api" long-name="m3g_core_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="openvg_binding_api" long-name="openvg_binding_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphics_plat/openvg_binding_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="graphics_pub" long-name="graphics_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics_pub" long-name="graphics_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphics_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="openvg_api" long-name="openvg_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/graphics/graphics_pub/openvg_api/group"/>
      </component>
     </collection>
@@ -4307,151 +4500,166 @@
    <block long-name="Text and Localisation" level="services" name="textandloc" levels="device encoding fonts text">
     <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
      <component name="AknJapaneseReading" long-name="Akn Japanese Reading">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/AknJapaneseReading/group"/>
      </component>
      <component name="charconv_fw" long-name="Character Encoding and Conversion Framework">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
      </component>
      <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" plugin="Y">
-      <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
      </component>
      <component name="CommonAdapter" long-name="Common Adapter">
-      <unit bldFile="os/textandloc/charconvfw/CommonAdapter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/CommonAdapter/group"/>
      </component>
      <component name="Findutil" long-name="Find Util">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/Findutil/group"/>
      </component>
      <component name="JPLangUtil" long-name="JP Lang Util">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/JPLangUtil/group"/>
      </component>
      <component name="Localizer" long-name="Localizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/Localizer/group"/>
      </component>
      <component name="SortUtil" long-name="Sort Util">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/SortUtil/group"/>
      </component>
      <component name="charconv" long-name="Charconv">
-      <unit bldFile="os/textandloc/charconvfw/charconv/group"/>
      </component>
      <component name="charconvplugin" long-name="Charconv Plugin">
-      <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
      </component>
      <component name="gamerecognizer" long-name="Game Recognizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
      </component>
      <component name="inlinetext" long-name="Inline Text">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
      </component>
      <component name="numbergrouping" long-name="Number Grouping">
-      <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/textandloc/charconvfw/numbergrouping/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ongoing" long-name="ongoing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/Charconv/ongoing/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="Charconvplugin" long-name="Charconvplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="os/textandloc/charconvfw/Charconvplugin/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="charconvfw" long-name="charconvfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/charconvfw/group"/>
      </component>
     </collection>
     <collection name="fontservices" long-name="Font Services" level="fonts">
      <component name="fontstore" long-name="Font Store">
-      <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
      </component>
      <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" plugin="Y">
-      <unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
      </component>
      <component name="graphicstestfonts" long-name="Graphics Test Fonts" introduced="tb91">
-      <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
      </component>
      <component name="textshaperplugin" long-name="Text Shaper Plugin" plugin="Y" introduced="9.2">
-      <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
      </component>
     </collection>
     <collection name="graphicsdevif" long-name="Graphics Device Interface" level="device">
      <component name="gdi" long-name="GDI">
-      <unit bldFile="os/textandloc/graphicsdevif/gdi/group" mrp="os/textandloc/graphicsdevif/gdi/group/graphics_gdi.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/graphicsdevif/gdi/group" mrp="os/textandloc/graphicsdevif/gdi/group/graphics_gdi.mrp"/>
      </component>
     </collection>
     <collection name="textrendering" long-name="Text Rendering" level="text">
      <component name="numberformatting" long-name="Number Formatting" introduced="7.0s">
-      <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
      </component>
      <component name="textformatting" long-name="Text Formatting">
-      <unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
      </component>
      <component name="texthandling" long-name="Text Handling">
-      <unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
      </component>
      <component name="word" long-name="Word" class="test">
       <unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="textandloc" long-name="textandloc">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="textandloc" long-name="textandloc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="textandloc_plat" long-name="textandloc_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="character_conversion_nonpublic_api" long-name="character_conversion_nonpublic_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_plat/character_conversion_nonpublic_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="findutil_api" long-name="findutil_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="textandloc_plat" long-name="textandloc_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="japanese_language_utilities_api" long-name="japanese_language_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sortutil_api" long-name="sortutil_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="textandloc_pub" long-name="textandloc_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="character_conversion_api" long-name="character_conversion_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_pub/character_conversion_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="character_conversion_plugin_provider_api" long-name="character_conversion_plugin_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="directory_localizer_api" long-name="directory_localizer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="textandloc_pub" long-name="textandloc_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/textandloc/textandloc_pub/group"/>
      </component>
     </collection>
@@ -4459,7 +4667,8 @@
    <block long-name="Build Tools" level="hw" name="buildtools" levels="bld mw fw ui">
     <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
      <component name="buildsystemtools" long-name="Build System Tools">
-      <unit bldFile="os/buildtools/bldsystemtools/buildsystemtools/group" mrp="os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/bldsystemtools/buildsystemtools/group" mrp="os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
      </component>
      <component name="commonbldutils" long-name="Common Utils">
       <unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
@@ -4474,12 +4683,10 @@
       <unit mrp="os/buildtools/devlib/devlibhelp/group/shared/developerlibrary_doc_plain_html.mrp"/>
      </component>
      <component name="devlibhelp" long-name="Developer Library Help">
-      <unit version="9.4" bldFile="os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp"/>
-      <unit version="9.5" bldFile="os/buildtools/devlib/devlibhelp/group/devlib95" mrp="os/buildtools/devlib/devlibhelp/group/devlib95/developerlibrary_doc_html.mrp"/>
      </component>
      <component name="devlibsrc" long-name="Developer Library Source" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/devlib/devlibhelp/securitysupplement/doc_source" mrp="os/buildtools/devlib/devlibhelp/developerlibrary_doc_source.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/devlib/devlibhelp/securitysupplement/doc_source" mrp="os/buildtools/devlib/devlibhelp/developerlibrary_doc_source.mrp"/>
      </component>
      <component name="toolsdocs" long-name="Tools Documentation">
       <unit mrp="os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
@@ -4487,52 +4694,40 @@
     </collection>
     <collection name="fileconv" long-name="File Converters" level="mw">
      <component name="alp2csh" long-name="ALP to CSH">
-      <unit bldFile="os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/>
      </component>
      <component name="cjpeg" long-name="CJpeg">
-      <unit bldFile="os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/>
      </component>
      <component name="rtf2ptml" long-name="RTF to PTML">
-      <unit bldFile="os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/>
      </component>
     </collection>
     <collection name="javatoolsplat" long-name="Java Tools Platform" level="mw">
      <component name="javalib" long-name="Java Library " filter="gt">
-      <unit bldFile="os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/>
      </component>
     </collection>
     <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
      <component name="autotest" long-name="Autotest">
-      <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
      </component>
      <component name="additionalredistribution" long-name="Additional Redistribution">
       <unit mrp="os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
      </component>
      <component name="burtestserver" long-name="BUR Test Server">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
      </component>
      <component name="prf" long-name="Product Realisation Framework">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
      </component>
      <component name="cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
      </component>
      <component name="cdb" long-name="Code Database">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
      </component>
      <component name="ctsfunctionalitycheckers" long-name="CTS Functionality Checkers">
       <unit mrp="os/buildtools/toolsandutils/ctsfunctionalitycheckers/Group/testtools_cts_functionalitycheckers.mrp"/>
      </component>
      <component name="e32tools" long-name="E32 Tools" class="PC" deprecated="tb91">
-      <unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
      </component>
      <component name="kitcomparator" long-name="Kit Comparator">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
      </component>
      <component name="kitsetupapp" long-name="Kit Setup App" filter="gt">
       <unit mrp="os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
@@ -4541,45 +4736,30 @@
       <unit mrp="os/buildtools/toolsandutils/navigationpages/tools_sdk_eng_NavigationPages.mrp"/>
      </component>
      <component name="productinstaller" long-name="Product Installer" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
      </component>
      <component name="productionbldtools" long-name="Production Build Tools" filter="gt">
       <unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
      </component>
      <component name="statdesktop" long-name="STAT Desktop" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
      </component>
      <component name="stlport" long-name="STL Port">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
      </component>
      <component name="systemmonitor" long-name="System Monitor" introduced="8.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
      </component>
      <component name="statapi" long-name="STAT API" filter="gt">
-      <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
      </component>
      <component name="statsource" long-name="STAT Source" filter="gt">
       <unit mrp="os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
      </component>
      <component name="testconfigfileparser" long-name="Test Config File Parser">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
      </component>
      <component name="testdriver" long-name="Test Driver">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
      </component>
      <component name="testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/>
      </component>
      <component name="usecasecontroller" long-name="Use Case Controller">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
      </component>
      <component name="wincredistribution" long-name="WinC Redistribution">
       <unit mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
@@ -4590,133 +4770,80 @@
     </collection>
     <collection name="binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
      <component name="captools" long-name="Capability Tools">
-      <unit bldFile="os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/>
      </component>
      <component name="depcheck" long-name="Dependency Checker">
-      <unit bldFile="os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/>
      </component>
     </collection>
     <collection name="bintools_os" long-name="Binary Tools" level="fw">
      <component name="evalid" long-name="Evalid">
-      <unit bldFile="os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/>
      </component>
      <component name="rcomp" long-name="Resource Compiler">
-      <unit bldFile="os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/>
      </component>
     </collection>
     <collection name="dist_os" long-name="Redistribution" level="mw">
      <component name="redistributionwinceka2" long-name="Redistribution WINC EKA2">
-      <unit bldFile="os/buildtools/dist_os/redistributionwinceka2" mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_cedar.mrp"/>
      </component>
     </collection>
     <collection name="imgtools_os" long-name="Image Tools" level="fw">
      <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91">
-      <unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
      </component>
     </collection>
     <collection name="misccomponents" long-name="Misc Components" level="mw">
      <component name="assertion" long-name="Assertion" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
      </component>
      <component name="bspbuilder" long-name="BSP Builder" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
      </component>
      <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
      </component>
      <component name="enum" long-name="Enum" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
      </component>
      <component name="envvar" long-name="Envvar" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
      </component>
      <component name="filesys" long-name="Filesys" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
      </component>
      <component name="installutils" long-name="Install Utils" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
      </component>
      <component name="jade" long-name="Jade " filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
      </component>
      <component name="javahelp" long-name="Java Help" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
      </component>
      <component name="langconfig" long-name="Language Config" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
      </component>
      <component name="launch" long-name="Launch" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
      </component>
      <component name="logger" long-name="Logger" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
      </component>
      <component name="mnemonicfix" long-name="Mnemonic Fix" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
      </component>
      <component name="pathbrowser" long-name="Path Browser" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
      </component>
      <component name="pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
      </component>
      <component name="runperl" long-name="Run PERL" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
      </component>
      <component name="sdkbuilder" long-name="SDK Building Tools">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
      </component>
      <component name="sdkpackagemgr" long-name="SDK Package Manager" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
      </component>
      <component name="sdkinfo" long-name="SDK Info" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
      </component>
      <component name="sdkpkgtools" long-name="SDK Package Tools" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
      </component>
      <component name="shellexec" long-name="Shell Exec" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
      </component>
      <component name="splash" long-name="Splash Screen">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
      </component>
      <component name="swingworker" long-name="Swing Worker" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
      </component>
      <component name="testcaserunner" long-name="Test Case Runner" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
      </component>
      <component name="toolbarpanel" long-name="Tool Bar Panel" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
      </component>
      <component name="toolsstubs" long-name="Devices Tools Stubs" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
      </component>
     </collection>
     <collection name="packaging" long-name="Packaging" level="ui">
@@ -4724,23 +4851,18 @@
       <unit mrp="os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
      </component>
      <component name="dummy" long-name="Dummy">
-      <unit bldFile="os/buildtools/packaging/dummy" mrp="os/buildtools/packaging/dummy/additional_dummy.mrp"/>
      </component>
     </collection>
     <collection name="perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
      <component name="legacycommonperl" long-name="Legacy Common Perl Libraries">
-      <unit bldFile="os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/>
      </component>
      <component name="commonperl" long-name="Common Perl Libraries">
-      <unit bldFile="os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/>
      </component>
      <component name="redistribution" long-name="Redistribution" filter="gt">
-      <unit bldFile="os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/>
      </component>
     </collection>
     <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
      <component name="bldtools" long-name="Build Tools" filter="gt">
-      <unit bldFile="os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/>
      </component>
      <component name="e32toolp" long-name="E32 Perl Tools" class="PC">
       <unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
@@ -4748,165 +4870,174 @@
     </collection>
     <collection name="srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
      <component name="leavescan" long-name="Leavescan">
-      <unit bldFile="os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/>
      </component>
      <component name="migrationtool" long-name="Migration Tool">
-      <unit bldFile="os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/>
      </component>
      <component name="programchecker" long-name="Program Checker" deprecated="tb91">
-      <unit bldFile="os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/>
      </component>
     </collection>
    </block>
    <block long-name="XML Services" level="services" name="xmlsrv" levels="plugin server framework generic specific">
     <collection name="xml" long-name="XML" level="generic">
      <component name="wbxmlparser" long-name="WBXML Parser" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
      </component>
      <component name="xmlexpatparser" long-name="XML Expat Parser" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
      </component>
      <component name="xmlfw" long-name="XML Framework" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
      </component>
     </collection>
     <collection name="xmlengine" long-name="XML Engine" level="server">
      <component name="domxpathwrapper" long-name="DOM XPath Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/domxpathwrapper/group"/>
      </component>
      <component name="libxml2" long-name="Libxml2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/libxml2/group"/>
      </component>
      <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/>
      </component>
      <component name="xmlengineserializer" long-name="XML Engines Erializer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/xmlengineserializer/group"/>
      </component>
      <component name="xmlengineutils" long-name="XML Engine Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/xmlengineutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlengine" long-name="xmlengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlengine/group"/>
      </component>
     </collection>
     <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
      <component name="xmlsec" long-name="XML Security">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
      </component>
      <component name="xmlseccertman" long-name="XML Security Certman">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
      </component>
      <component name="xmlseccrypto" long-name="XML Security Crypto">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
      </component>
      <component name="xmlsecwrapper" long-name="XML Security Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlsecurityengine" long-name="xmlsecurityengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsecurityengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="xmlsrv" long-name="xmlsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlsrv" long-name="xmlsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="xmlsrv_plat" long-name="xmlsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlsrv_plat" long-name="xmlsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_canonical_xml_api" long-name="libxml2_canonical_xml_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_canonical_xml_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_parser_api" long-name="libxml2_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_utils_api" long-name="libxml2_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_xml_linking_api" long-name="libxml2_xml_linking_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_linking_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_xml_pointer_api" long-name="libxml2_xml_pointer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_pointer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_xml_schemas_api" long-name="libxml2_xml_schemas_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_schemas_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libxml2_xpath_api" long-name="libxml2_xpath_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xpath_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_encryption_api" long-name="xml_encryption_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_engine_deserializer_api" long-name="xml_engine_deserializer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_deserializer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_engine_serializer_api" long-name="xml_engine_serializer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_engine_utils_api" long-name="xml_engine_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_engine_xpath_api" long-name="xml_engine_xpath_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_security_engine_utils_api" long-name="xml_security_engine_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_signature_api" long-name="xml_signature_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="xmlsrv_pub" long-name="xmlsrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlsrv_pub" long-name="xmlsrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_engine_dom_api" long-name="xml_engine_dom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/group"/>
      </component>
     </collection>
@@ -4914,41 +5045,37 @@
    <block long-name="Device Platform Release" level="services" name="deviceplatformrelease" levels="bld mid top">
     <collection name="S60Extras" long-name="S60 Extras" level="mid">
      <component name="S60Extras compo" long-name="S60 Extras Component">
-      <unit bldFile="os/deviceplatformrelease/S60Extras/S60Extras compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60Extras" long-name="S60Extras">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
      </component>
     </collection>
     <collection name="S60Helps" long-name="S60 Helps" level="mid">
      <component name="S60Helps compo" long-name="S60 Helps Component">
-      <unit bldFile="os/deviceplatformrelease/S60Helps/S60Helps compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60Helps" long-name="S60Helps">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/S60Helps/Group"/>
      </component>
     </collection>
     <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
      <component name="S60LocFiles compo" long-name="S60 Loc Files Component">
-      <unit bldFile="os/deviceplatformrelease/S60LocFiles/S60LocFiles compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60LocFiles" long-name="S60LocFiles">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/S60LocFiles/group"/>
      </component>
     </collection>
     <collection name="Version" long-name="Version" level="top">
      <component name="Version compo" long-name="Version Component">
-      <unit bldFile="os/deviceplatformrelease/Version/Version compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Version" long-name="Version">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/Version/group"/>
      </component>
     </collection>
@@ -4965,26 +5092,28 @@
       <unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="sf_config" long-name="sf_config">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="apac" long-name="apac">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/sf_config/config/apac/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="config" long-name="config">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/imaker/config/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="japan" long-name="japan">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="western" long-name="western">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/>
      </component>
     </collection>
@@ -4992,278 +5121,264 @@
    <block long-name="OS RD tools" level="services" name="osrndtools" levels="fw trace">
     <collection name="opensystemtrace" long-name="Open System Trace" level="trace">
      <component name="tracecompiler" long-name="Trace Compiler">
-      <unit bldFile="os/osrndtools/opensystemtrace/tracecompiler/group"/>
      </component>
     </collection>
     <collection name="stif" long-name="STIF" level="fw">
      <component name="ATSInterface" long-name="ATS Interface">
-      <unit bldFile="os/osrndtools/stif/ATSInterface/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/ATSInterface/group"/>
      </component>
      <component name="ATSLogger" long-name="ATS Logger">
-      <unit bldFile="os/osrndtools/stif/ATSLogger/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/ATSLogger/group"/>
      </component>
      <component name="ConsoleUI" long-name="Console UI">
-      <unit bldFile="os/osrndtools/stif/ConsoleUI/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/ConsoleUI/group"/>
      </component>
      <component name="DemoModule" long-name="Demo Module">
-      <unit bldFile="os/osrndtools/stif/DemoModule/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/DemoModule/group"/>
      </component>
      <component name="SUEvent" long-name="SU Event">
-      <unit bldFile="os/osrndtools/stif/SUEvent/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/SUEvent/group"/>
      </component>
      <component name="StifKernelTestClassBase" long-name="STIF Kernel Test Class Base">
-      <unit bldFile="os/osrndtools/stif/StifKernelTestClassBase/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/StifKernelTestClassBase/group"/>
      </component>
      <component name="StifTFwIf" long-name="STIF TFwIf">
-      <unit bldFile="os/osrndtools/stif/StifTFwIf/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/StifTFwIf/group"/>
      </component>
      <component name="TestCombiner" long-name="Test Combiner">
-      <unit bldFile="os/osrndtools/stif/TestCombiner/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestCombiner/group"/>
      </component>
      <component name="TestEngine" long-name="Test Engine">
-      <unit bldFile="os/osrndtools/stif/TestEngine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestEngine/group"/>
      </component>
      <component name="TestInterface" long-name="Test Interface">
-      <unit bldFile="os/osrndtools/stif/TestInterface/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestInterface/group"/>
      </component>
      <component name="TestModuleTemplates" long-name="Test Module Templates">
-      <unit bldFile="os/osrndtools/stif/TestModuleTemplates/group"/>
      </component>
      <component name="TestScripter" long-name="Test Scripter">
-      <unit bldFile="os/osrndtools/stif/TestScripter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestScripter/group"/>
      </component>
      <component name="TestServer" long-name="Test Server">
-      <unit bldFile="os/osrndtools/stif/TestServer/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestServer/group"/>
      </component>
      <component name="TestServerStarter" long-name="Test Server Starter">
-      <unit bldFile="os/osrndtools/stif/TestServerStarter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestServerStarter/group"/>
      </component>
      <component name="examples" long-name="Examples">
-      <unit bldFile="os/osrndtools/stif/examples/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StifHWResetStub" long-name="StifHWResetStub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/examples/StifHWResetStub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="STIFTestMeasurementStub" long-name="STIFTestMeasurementStub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/examples/STIFTestMeasurementStub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stif" long-name="stif">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CapsModifierXXX" long-name="CapsModifierXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/CapsModifierXXX/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HardCodedTestModuleXXX" long-name="HardCodedTestModuleXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/HardCodedTestModuleXXX/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="STIFUnitXXX" long-name="STIFUnitXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/STIFUnitXXX/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TemplateKernelScriptXXX" long-name="TemplateKernelScriptXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/TemplateKernelScriptXXX/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TemplateScriptXXX" long-name="TemplateScriptXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/TemplateScriptXXX/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TestModuleXXX" long-name="TestModuleXXX">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/stif/TestModuleTemplates/TestModuleXXX/group"/>
      </component>
     </collection>
     <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
      <component name="cinidata" long-name="CINI Data">
-      <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
      </component>
      <component name="testexecute" long-name="Test Execute" deprecated="tb91">
-      <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="osrndtools" long-name="osrndtools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osrndtools" long-name="osrndtools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="hti" long-name="hti">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hti" long-name="hti">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiAutoStart" long-name="HtiAutoStart">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiAutoStart/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiCfg" long-name="HtiCfg">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiCfg/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiBtCommPlugin" long-name="HtiBtCommPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiIPCommPlugin" long-name="HtiIPCommPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiSerialCommPlugin" long-name="HtiSerialCommPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiUsbSerialCommPlugin" long-name="HtiUsbSerialCommPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiFileHlp" long-name="HtiFileHlp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiFileHlp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiFramework" long-name="HtiFramework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiFramework/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiAppServicePlugin" long-name="HtiAppServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiEchoServicePlugin" long-name="HtiEchoServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiFtpServicePlugin" long-name="HtiFtpServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiIpProxyServicePlugin" long-name="HtiIpProxyServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiStifTfServicePlugin" long-name="HtiStifTfServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiWatchDog" long-name="HtiWatchDog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/hti/HtiWatchDog/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="memspy" long-name="memspy">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CommandLine" long-name="CommandLine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/memspy/CommandLine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Console" long-name="Console">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/memspy/Console/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Driver" long-name="Driver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/memspy/Driver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Engine" long-name="Engine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/memspy/Engine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memspy" long-name="memspy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/memspy/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="osrndtools_plat" long-name="osrndtools_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osrndtools_plat" long-name="osrndtools_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/osrndtools_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hti_api" long-name="hti_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memspy_api" long-name="memspy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="open_system_trace_api" long-name="open_system_trace_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stif_api" long-name="stif_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
      </component>
     </collection>
@@ -5271,19 +5386,18 @@
    <block long-name="Software Config Tools" level="services" name="swconfigtools">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
      <component name="DBImporter" long-name="DB Importer">
-      <unit bldFile="os/swconfigtools/gid_pc_tool/DBImporter/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gid_pc_tool" long-name="gid_pc_tool">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="swconfigtools" long-name="swconfigtools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="swconfigtools" long-name="swconfigtools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/swconfigtools/group"/>
      </component>
     </collection>
@@ -5293,28 +5407,33 @@
    <block long-name="Generic Application Support" level="generic" name="appsupport" levels="system plugin framework server generic specific">
     <collection name="appfw" long-name="Application Framework" level="framework">
      <component name="apparchitecture" long-name="Application Architecture">
-      <unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
      </component>
      <component name="uiftestfw" long-name="UIF Test Framework" class="test" introduced="9.2">
       <unit mrp="mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
      </component>
      <component name="viewserver" long-name="View Server" introduced="6.0">
-      <unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
      </component>
     </collection>
     <collection name="applaunchservices" long-name="Application Launch Services" level="generic"/>
     <collection name="commonappservices" long-name="Common Application Services" level="framework">
      <component name="alarmserver" long-name="Alarm Server" introduced="7.0">
-      <unit bldFile="mw/appsupport/commonappservices/alarmserver/Group" mrp="mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/commonappservices/alarmserver/Group" mrp="mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
      </component>
      <component name="alarmservertest" long-name="Alarm Server Test" introduced="8.1" class="test" deprecated="tb92">
-      <unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
      </component>
      <component name="appservicesdocs" long-name="Application Services Documentation" class="doc">
       <unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
      </component>
      <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1">
-      <unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
      </component>
      <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" class="test">
       <!-- XML Previous Location: Application Services/Other Application Services/ -->
@@ -5323,764 +5442,807 @@
     </collection>
     <collection name="contenthandling" long-name="Content Handling" level="plugin">
      <component name="contenthandlingfw" long-name="Content Handling Framework" introduced="8.0">
-      <unit bldFile="mw/appsupport/contenthandling/contenthandlingfw/Group" mrp="mw/appsupport/contenthandling/contenthandlingfw/Group/content-handling.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/contenthandling/contenthandlingfw/Group" mrp="mw/appsupport/contenthandling/contenthandlingfw/Group/content-handling.mrp"/>
      </component>
      <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0">
-      <unit bldFile="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group" mrp="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
      </component>
      <component name="webrecognisers" long-name="Web Recognisers" plugin="Y">
-      <unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
      </component>
     </collection>
     <collection name="filehandling" long-name="File Handling" level="server">
      <component name="fileconverterfw" long-name="File Converter Framework">
-      <unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
      </component>
      <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" plugin="Y" introduced="7.0">
-      <unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
      </component>
      <component name="fileconverterplugins" long-name="Other File Converter Plugins" plugin="Y" introduced="5.0" deprecated="9.3">
-      <unit bldFile="mw/appsupport/filehandling/fileconverterplugins/group" mrp="mw/appsupport/filehandling/fileconverterplugins/group/app-engines_convert.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/filehandling/fileconverterplugins/group" mrp="mw/appsupport/filehandling/fileconverterplugins/group/app-engines_convert.mrp"/>
      </component>
      <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
      </component>
     </collection>
     <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
      <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91">
-      <unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
      </component>
     </collection>
     <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
      <component name="commandshell" long-name="Command Shell" introduced="tb92">
-      <unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
      </component>
      <component name="telnetserver" long-name="Telnet Server" introduced="tb92">
-      <unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
      </component>
     </collection>
     <collection name="printingsupport" long-name="Printing Support" level="generic">
      <component name="printinguisupport" long-name="Printing UI Support">
-      <unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
      </component>
     </collection>
     <collection name="sensorsupport" long-name="Sensor Support" level="generic"/>
     <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
      <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" class="config PC">
-      <unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
      </component>
      <component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" class="config PC">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="mw/appsupport/tzpcside/worlddatabasekit/group" mrp="mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzpcside/worlddatabasekit/group" mrp="mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
      </component>
      <component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" class="config PC">
-      <unit bldFile="mw/appsupport/tzpcside/worldtools/group" mrp="mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzpcside/worldtools/group" mrp="mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
      </component>
     </collection>
     <collection name="tzservices" long-name="Time Zone Services" level="plugin">
      <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" class="config">
-      <unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
      </component>
      <component name="tzloc" long-name="Time Zone Localization" introduced="9.1">
-      <unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
      </component>
      <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" class="config">
-      <unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
      </component>
      <component name="tzserver" long-name="Time Zone Server" introduced="9.1">
-      <unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
      </component>
      <component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1">
-      <unit bldFile="mw/appsupport/tzservices/worldserver/group" mrp="mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/worldserver/group" mrp="mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
      </component>
      <component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" class="test">
-      <unit bldFile="mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
      </component>
     </collection>
     <collection name="contextframework" long-name="Context Framework" level="framework">
      <component name="cfw" long-name="Context Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfw/group"/>
      </component>
      <component name="cfwplugins" long-name="Context Framework Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ApplicationStateSourcePlugIn" long-name="ApplicationStateSourcePlugIn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CallStateSourcePlugIn" long-name="CallStateSourcePlugIn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/CallStateSourcePlugIn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cenrepsourceplugin" long-name="cenrepsourceplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/cenrepsourceplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="displaysourceplugin" long-name="displaysourceplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/displaysourceplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="orientationactionplugin" long-name="orientationactionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/orientationactionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PSStateSourcePlugIn" long-name="PSStateSourcePlugIn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/PSStateSourcePlugIn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensorsourceplugin" long-name="sensorsourceplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/sensorsourceplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vibraactionplugin" long-name="vibraactionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/vibraactionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contextframework" long-name="contextframework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/contextframework/group"/>
      </component>
     </collection>
     <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
      <component name="DbRecovery" long-name="Db Recovery">
-      <unit bldFile="mw/appsupport/coreapplicationuis/DbRecovery/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/appsupport/coreapplicationuis/DbRecovery/Group"/>
      </component>
      <component name="GSServer" long-name="GS Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/GSServer/group"/>
      </component>
      <component name="GSServerEngine" long-name="GS Server Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/GSServerEngine/group"/>
      </component>
      <component name="NspsWsPlugin" long-name="Nsps WS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/NspsWsPlugin/group"/>
      </component>
      <component name="Rfs" long-name="RFS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/Rfs/group"/>
      </component>
      <component name="SysAp" long-name="Sys Ap">
-      <unit bldFile="mw/appsupport/coreapplicationuis/SysAp/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/appsupport/coreapplicationuis/SysAp/Group"/>
      </component>
      <component name="VariatedSettings" long-name="Variated Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/VariatedSettings/group"/>
      </component>
      <component name="accfwuinotifier" long-name="ACC Framework UI Notifier">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
      </component>
      <component name="advancedtspcontroller" long-name="Advanced TSP Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
      </component>
      <component name="gsserverenginestub" long-name="GS Server Engine Stub">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
      </component>
      <component name="kefmapper" long-name="Key Event Framework Mapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
      </component>
      <component name="powersaveutilities" long-name="Power Save Utilities">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
      </component>
      <component name="rfsplugins" long-name="Rfs Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="coreapplicationuis" long-name="coreapplicationuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSRFSPlugin" long-name="GSRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AIRFSPlugin" long-name="AIRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/AIRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CertRFSPlugin" long-name="CertRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/CertRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ClockRFSPlugin" long-name="ClockRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/ClockRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DatastoreRFSPlugin" long-name="DatastoreRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DefaultFolderRFSPlugin" long-name="DefaultFolderRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DisplayContrastPlugin" long-name="DisplayContrastPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FavouritesRFSPlugin" long-name="FavouritesRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FormatterRFSPlugin" long-name="FormatterRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/FormatterRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="NitzRFSPlugin" long-name="NitzRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/NitzRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SIPRFSPlugin" long-name="SIPRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/SIPRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StarterRFSPlugin" long-name="StarterRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/StarterRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SyncMLRFSPlugin" long-name="SyncMLRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TelephonyRFSPlugin" long-name="TelephonyRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="UnitconverterRFSPlugin" long-name="UnitconverterRFSPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensordatacompensatorplugin" long-name="sensordatacompensatorplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
      </component>
     </collection>
     <collection name="flashliteapi_3_0" long-name="Flashlite API 3.0" level="specific">
      <component name="flashliteapi_3_0_compo" long-name="Flashlite API 3.0 Component">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/flashliteapi_3_0/flashliteapi_3_0_compo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flashliteapi_3_0" long-name="flashliteapi_3_0">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/flashliteapi_3_0/group"/>
      </component>
     </collection>
     <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
      <component name="Gs" long-name="GS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gssettingsuis" long-name="gssettingsuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSAdminPlugin" long-name="GSAdminPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSAdminPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSApplication" long-name="GSApplication">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSApplication"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSAppsPlugin" long-name="GSAppsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSAppsPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSAutoKeyguardPlugin" long-name="GSAutoKeyguardPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSAutoKeyguardPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSBackgroundImage" long-name="GSBackgroundImage">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSBackgroundImage"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSCallBarringPlugin" long-name="GSCallBarringPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSCallBarringPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSCallDivertPlugin" long-name="GSCallDivertPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSCallDivertPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSCallPlugin" long-name="GSCallPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSCallPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSConPlugin" long-name="GSConPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSConPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSDataCallPlugin" long-name="GSDataCallPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSDataCallPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSDeviceManagementPlugin" long-name="GSDeviceManagementPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSDeviceManagementPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSDiagnosticsPlugin" long-name="GSDiagnosticsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSDiagnosticsPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSDisplayPlugin" long-name="GSDisplayPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSDisplayPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSFramework" long-name="GSFramework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSFramework"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSGenPlugin" long-name="GSGenPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSGenPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSIndicatorPlugin" long-name="GSIndicatorPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSIndicatorPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSInstallationsPlugin" long-name="GSInstallationsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSInstallationsPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gslauncher" long-name="gslauncher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/gslauncher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSListBox" long-name="GSListBox">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSListBox"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSNetworkPlugin" long-name="GSNetworkPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSNetworkPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSOpticalJoystickPlugin" long-name="GSOpticalJoystickPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSOpticalJoystickPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPDataAccessPointPlugin" long-name="GSPDataAccessPointPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPDataAccessPointPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPDataConnectionPlugin" long-name="GSPDataConnectionPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPDataConnectionPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPDataHSDPAPlugin" long-name="GSPDataHSDPAPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPDataHSDPAPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPDataPlugin" long-name="GSPDataPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPDataPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPowerSavingQueryPlugin" long-name="GSPowerSavingQueryPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPowerSavingQueryPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSPrslnPlugin" long-name="GSPrslnPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSPrslnPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSSecurityPlugin" long-name="GSSecurityPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSSecurityPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSSynchronisationPlugin" long-name="GSSynchronisationPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSSynchronisationPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSTelPlugin" long-name="GSTelPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/gssettingsuis/Gs/GSTelPlugin"/>
      </component>
     </collection>
     <collection name="mediakeys" long-name="Media Keys" level="plugin">
      <component name="KeyPublisherPlugin" long-name="Key Publisher Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/mediakeys/KeyPublisherPlugin/group"/>
      </component>
      <component name="MMKeyBearer" long-name="MM Key Bearer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/mediakeys/MMKeyBearer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediakeys" long-name="mediakeys">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/mediakeys/group"/>
      </component>
     </collection>
     <collection name="profilesservices" long-name="Profiles Services" level="server">
      <component name="FileList" long-name="File List">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/profilesservices/FileList/group"/>
      </component>
      <component name="MediaFileList" long-name="Media File List">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/profilesservices/MediaFileList/group"/>
      </component>
      <component name="ProfileEngine" long-name="Profile Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/profilesservices/ProfileEngine/group"/>
      </component>
      <component name="RingingTone3DPlugin" long-name="Ringing Tone 3D Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/profilesservices/RingingTone3DPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profilesservices" long-name="profilesservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/profilesservices/group"/>
      </component>
     </collection>
     <collection name="startupservices" long-name="Startup Services" level="system">
      <component name="SplashScreen" long-name="Splash Screen">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/SplashScreen/group"/>
      </component>
      <component name="Startup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/Startup/group"/>
      </component>
      <component name="startupanimation" long-name="Startup Animation">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startupservices" long-name="startupservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MediatorPlugin" long-name="MediatorPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/Startup/MediatorPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startupsyncplugin" long-name="startupsyncplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/Startup/startupsyncplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemerrorplugin" long-name="systemerrorplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/startupservices/Startup/systemerrorplugin/group"/>
      </component>
     </collection>
     <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
      <component name="oodmonitor" long-name="OOD Monitor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
      </component>
      <component name="oommonitor" long-name="OOM Monitor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sysresmonitoring" long-name="sysresmonitoring">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/sysresmonitoring/group"/>
      </component>
     </collection>
     <collection name="systemsettings" long-name="System Settings" level="system">
      <component name="GSAccessoryPlugin" long-name="GS Accessory Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/systemsettings/GSAccessoryPlugin/group"/>
      </component>
      <component name="gssensorplugin" long-name="GS Sensor Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemsettings" long-name="systemsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/systemsettings/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appsupport" long-name="appsupport">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appsupport" long-name="appsupport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appsupport_plat" long-name="appsupport_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="action_plugin_api" long-name="action_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="application_orientation_api" long-name="application_orientation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_access_api" long-name="context_access_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_framework_client_api" long-name="context_framework_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_framework_listener_api" long-name="context_framework_listener_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_framework_services_api" long-name="context_framework_services_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_framework_version_api" long-name="context_framework_version_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_source_plugin_api" long-name="context_source_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_source_settings_manager_api" long-name="context_source_settings_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_subscription_api" long-name="context_subscription_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filelist_api" long-name="filelist_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/filelist_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flash_mmi_service_interface_custom_api" long-name="flash_mmi_service_interface_custom_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flash_netscape_plugin_command_api" long-name="flash_netscape_plugin_command_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appsupport_plat" long-name="appsupport_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="key_event_framework_api" long-name="key_event_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="key_event_framework_mapper_api" long-name="key_event_framework_mapper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_keys_definition_api" long-name="media_keys_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ood_threshold_api" long-name="ood_threshold_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oom_monitor_api" long-name="oom_monitor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oom_monitor_plugin_api" long-name="oom_monitor_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="operation_provider_api" long-name="operation_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonecmdhandler_api" long-name="phonecmdhandler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profiles_engine_api" long-name="profiles_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profiles_mediafilelist_api" long-name="profiles_mediafilelist_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/profiles_mediafilelist_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restore_factory_settings_api" long-name="restore_factory_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restore_factory_settings_plugin_api" long-name="restore_factory_settings_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secondary_display_accfw_api" long-name="secondary_display_accfw_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secondary_display_startup_api" long-name="secondary_display_startup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secondary_display_sysap_api" long-name="secondary_display_sysap_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secondary_display_system_state_api" long-name="secondary_display_system_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor_user_setting_api" long-name="sensor_user_setting_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_backgroundimage_api" long-name="settings_backgroundimage_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_framework_api" long-name="settings_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_launch_api" long-name="settings_launch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_listbox_api" long-name="settings_listbox_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_plugin_api" long-name="settings_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_uis_cenrep_collection_api" long-name="settings_uis_cenrep_collection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/settings_uis_cenrep_collection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startup_configuration_api" long-name="startup_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_application_key_handler_plugin_api" long-name="system_application_key_handler_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_application_light_control_plugin_api" long-name="system_application_light_control_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_application_notification_api" long-name="system_application_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system_application_plugin_callback_api" long-name="system_application_plugin_callback_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appsupport_pub" long-name="appsupport_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flash_viewer_framework_api" long-name="flash_viewer_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appsupport_pub" long-name="appsupport_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="network_status_api" long-name="network_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profiles_engine_active_profile_settings_api" long-name="profiles_engine_active_profile_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_active_profile_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profiles_engine_wrapper_api" long-name="profiles_engine_wrapper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/group"/>
      </component>
     </collection>
@@ -6088,234 +6250,251 @@
    <block long-name="Security Services" level="generic" name="securitysrv" levels="plugin framework server generic specific">
     <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
      <component name="IntegrityCheck.exe=binary">
-      <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
      </component>
      <component name="IntegrityCheckClient.dll=binary">
-<!--       <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/> -->
      </component>
      <component name="IntegrityCheckServer.exe=binary">
-<!--       <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/> -->
      </component>
      <component name="TrkDummy" long-name="Trk Dummy">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/boottimeintegritycheck/TrkDummy/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="boottimeintegritycheck" long-name="boottimeintegritycheck">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
+     </component>
     </collection>
     <collection name="cms" long-name="Certificate Management Services" level="generic">
      <component name="CMS.Dll=binary" long-name="CMS">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cms" long-name="cms">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/cms/group"/>
      </component>
     </collection>
     <collection name="gba" long-name="Generic Boot Architecture" level="specific">
      <component name="bootstrap" long-name="Bootstrap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/bootstrap/group"/>
      </component>
      <component name="gbaapi" long-name="GBA API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
      </component>
      <component name="gbafilter" long-name="GBA Filter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
      </component>
      <component name="gbaserver" long-name="GBA Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
      </component>
      <component name="uicc" long-name="Uicc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/uicc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gba" long-name="gba">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/gba/group"/>
      </component>
     </collection>
     <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
      <component name="CTSecurityDialogs" long-name="CT Security Dialogs">
-      <unit bldFile="mw/securitysrv/pkiutilities/CTSecurityDialogs/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/pkiutilities/CTSecurityDialogs/Group"/>
      </component>
      <component name="CertSaver" long-name="Cert Saver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/CertSaver/group"/>
      </component>
      <component name="Certificates">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/Certificates/group"/>
      </component>
      <component name="CertmanUi" long-name="Certman UI">
-      <unit bldFile="mw/securitysrv/pkiutilities/CertmanUi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/pkiutilities/CertmanUi/GROUP"/>
      </component>
      <component name="DeviceToken" long-name="Device Token">
-      <unit bldFile="mw/securitysrv/pkiutilities/DeviceToken/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/pkiutilities/DeviceToken/Group"/>
      </component>
      <component name="PKCS12">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/PKCS12/group"/>
      </component>
      <component name="SecModUI" long-name="Sec Mod UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/SecModUI/group"/>
      </component>
      <component name="x509certnameparser" long-name="X509cert Name Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Certificates_OEM" long-name="Certificates_OEM">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/Certificates_OEM/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pkiutilities" long-name="pkiutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/pkiutilities/group"/>
      </component>
     </collection>
     <collection name="remotelock" long-name="Remote Lock" level="server">
      <component name="RemoteLockEngine" long-name="Remote Lock Engine">
-      <unit bldFile="mw/securitysrv/remotelock/RemoteLockEngine/group"/>
      </component>
      <component name="RemotelockSettings" long-name="Remote Lock Settings">
-      <unit bldFile="mw/securitysrv/remotelock/RemotelockSettings/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotelock" long-name="remotelock">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/remotelock/Group"/>
      </component>
     </collection>
     <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
      <component name="Autolock">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/securitydialogs/Autolock/group"/>
      </component>
      <component name="SecUi" long-name="Sec UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/securitydialogs/SecUi/group"/>
      </component>
      <component name="Securitynotifier" long-name="Security Notifier">
-      <unit bldFile="mw/securitysrv/securitydialogs/Securitynotifier/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/securitydialogs/Securitynotifier/Group"/>
      </component>
      <component name="Securityobserver" long-name="Security Observer">
-      <unit bldFile="mw/securitysrv/securitydialogs/Securityobserver/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/securitysrv/securitydialogs/Securityobserver/Group"/>
      </component>
      <component name="keylockpolicyapi" long-name="Keylock Policy Api">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="securitydialogs" long-name="securitydialogs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/securitydialogs/group"/>
      </component>
     </collection>
     <collection name="wim" long-name="WIM" level="framework">
      <component name="Scard" long-name="S Card">
-      <unit bldFile="mw/securitysrv/wim/Scard/group"/>
      </component>
      <component name="SwimReader" long-name="Swim Reader">
-      <unit bldFile="mw/securitysrv/wim/SwimReader/group"/>
      </component>
      <component name="WimClient" long-name="WIM Client">
-      <unit bldFile="mw/securitysrv/wim/WimClient/group"/>
      </component>
      <component name="WimPlugin" long-name="WIM Plugin">
-      <unit bldFile="mw/securitysrv/wim/WimPlugin/group"/>
      </component>
      <component name="WimServer" long-name="WIM Server">
-      <unit bldFile="mw/securitysrv/wim/WimServer/group"/>
      </component>
      <component name="WimUtil" long-name="WIM Util">
-      <unit bldFile="mw/securitysrv/wim/WimUtil/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wim" long-name="wim">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/wim/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="securitysrv" long-name="securitysrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="securitysrv" long-name="securitysrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="secsrv_plat" long-name="secsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cms_api" long-name="cms_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicelock_access_api" long-name="devicelock_access_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="device_key_store_encryption_plugin_api" long-name="device_key_store_encryption_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gba_api" long-name="gba_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secsrv_plat" long-name="secsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_utils_api" long-name="java_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="keyguard_access_api" long-name="keyguard_access_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="keyguard_configuration_api" long-name="keyguard_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="keylock_policy_api" long-name="keylock_policy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lockapp_server_api" long-name="lockapp_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pkcs12_parser_api" long-name="pkcs12_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pkidialog_api" long-name="pkidialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioning_api" long-name="provisioning_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remote_lock_api" long-name="remote_lock_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="security_code_ui_api" long-name="security_code_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wim_cert_api" long-name="wim_cert_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="x509certnameparser_api" long-name="x509certnameparser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
      </component>
     </collection>
@@ -6323,314 +6502,329 @@
    <block long-name="DRM" level="generic" name="drm" levels="plugin framework server generic specific">
     <collection name="commondrm" long-name="Common DRM" level="generic">
      <component name="drmencryptor" long-name="DRM Encryptor">
-      <unit bldFile="mw/drm/commondrm/drmencryptor/group"/>
      </component>
      <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI">
-      <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/group"/>
      </component>
      <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
      </component>
      <component name="drmsettingsplugin" long-name="DRM Settings Plugin">
-      <unit bldFile="mw/drm/commondrm/drmsettingsplugin/group"/>
      </component>
      <component name="drmutility" long-name="DRM Utility">
-      <unit bldFile="mw/drm/commondrm/drmutility/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/drmutility/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/drm/commondrm/drmutility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commondrm" long-name="commondrm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/commondrm/group"/>
      </component>
     </collection>
     <collection name="omadrm" long-name="OMA DRM" level="server">
      <component name="drmengine" long-name="DRM Engine">
-      <unit bldFile="mw/drm/omadrm/drmengine/group"/>
      </component>
      <component name="drmhelper" long-name="DRM Helper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmhelper/group"/>
      </component>
      <component name="drmlicensemanager" long-name="Drm License Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/>
      </component>
      <component name="drmplugins" long-name="DRM Plugins">
-      <unit bldFile="mw/drm/omadrm/drmplugins/group"/>
      </component>
      <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmhelperserver" long-name="drmhelperserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmhelper/drmhelperserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmfilter" long-name="drmfilter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmplugins/drmfilter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmrecognizer" long-name="drmrecognizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmplugins/drmrecognizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmrohandler" long-name="drmrohandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmplugins/drmrohandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmromtm" long-name="drmromtm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/drmplugins/drmromtm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omadrm" long-name="omadrm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/omadrm/group"/>
      </component>
     </collection>
     <collection name="wmdrm" long-name="WM DRM" level="framework">
      <component name="camese" long-name="Camese">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/group"/>
      </component>
      <component name="wmdrmengine" long-name="WM DRM Engine">
-      <unit bldFile="mw/drm/wmdrm/wmdrmengine/group"/>
      </component>
      <component name="wmdrmplugins" long-name="WM DRM Plugins">
-      <unit bldFile="mw/drm/wmdrm/wmdrmplugins/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cameseutility" long-name="cameseutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/cameseutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cameseutility_dist" long-name="cameseutility_dist">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/cameseutility_dist/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="httpfiltercamese" long-name="httpfiltercamese">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/httpfiltercamese/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdla" long-name="wmdrmdla">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdla/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdlaapp" long-name="wmdrmdlaapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlaapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdladefaulthttpplugin" long-name="wmdrmdladefaulthttpplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdladefaultuiplugin" long-name="wmdrmdladefaultuiplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdlautils" long-name="wmdrmdlautils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlautils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdlawrapper" long-name="wmdrmdlawrapper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmdla_dist" long-name="wmdrmdla_dist">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/camese/wmdrmdla_dist/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrm" long-name="wmdrm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmagent" long-name="wmdrmagent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmagent_dist" long-name="wmdrmagent_dist">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent_dist/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="client" long-name="client">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmpkserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/harvester/client/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/locationmanager/client/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/metadataengine/client/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/engine/client/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/flashrtpolicyserver/client/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="server" long-name="server">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmpkserver/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/harvester/server/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/locationmanager/server/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/metadataengine/server/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/engine/server/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/flashrtpolicyserver/server/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clientwrapper" long-name="clientwrapper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmpkserver/clientwrapper/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix" long-name="helix">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmplugins/helix"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtp_dist" long-name="mtp_dist">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmplugins/mtp_dist/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrmota" long-name="wmdrmota">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/wmdrm/wmdrmplugins/wmdrmota/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="drm" long-name="drm">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm" long-name="drm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="drm_plat" long-name="drm_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camese_framework_api" long-name="camese_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camese_utility_api" long-name="camese_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dcf_repository_api" long-name="dcf_repository_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_agents_api" long-name="drm_agents_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_common_api" long-name="drm_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_legacy_api" long-name="drm_legacy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_license_manager_api" long-name="drm_license_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_rights_api" long-name="drm_rights_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_secondary_display_api" long-name="drm_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_service_api" long-name="drm_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_utility_api" long-name="drm_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_plat" long-name="drm_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="roap_api" long-name="roap_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmdrm_core_api" long-name="wmdrm_core_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="drm_pub" long-name="drm_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_helper_api" long-name="drm_helper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_license_checker_api" long-name="drm_license_checker_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_pub" long-name="drm_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_drm_caf_agent_api" long-name="oma_drm_caf_agent_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
      </component>
     </collection>
@@ -6638,140 +6832,144 @@
    <block long-name="Access Security" level="generic" name="accesssec" levels="plugin framework server generic specific">
     <collection name="eapol" long-name="EAPOL" level="framework">
      <component name="eapol_framework" long-name="EAPOL Framework">
-      <unit bldFile="mw/accesssec/eapol/eapol_framework/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapol_symbian" long-name="eapol_symbian">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group/wpxeap"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group/wpxeapol"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wapi_symbian" long-name="wapi_symbian">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/eapol/eapol_framework/wapi_symbian/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapol" long-name="eapol">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/eapol/group"/>
      </component>
     </collection>
     <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
      <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/group"/>
      </component>
      <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
      </component>
      <component name="wifiprotectedsetup" long-name="WIFI Protected Setup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
      </component>
      <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group/wpx"/>
      </component>
      <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlansecuritysettings" long-name="wlansecuritysettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stub" long-name="stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="accesssec" long-name="accesssec">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accesssec" long-name="accesssec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="accesssec_plat" long-name="accesssec_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapaka_db_api" long-name="eapaka_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapgtc_db_api" long-name="eapgtc_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapleap_db_api" long-name="eapleap_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapmschapv2_db_api" long-name="eapmschapv2_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eapsim_db_api" long-name="eapsim_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaptlspeap_db_api" long-name="eaptlspeap_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eap_type_api" long-name="eap_type_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eap_vpn_api" long-name="eap_vpn_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accesssec_plat" long-name="accesssec_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wapi_db_api" long-name="wapi_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wapi_security_settings_ui_api" long-name="wapi_security_settings_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wep_security_settings_ui_api" long-name="wep_security_settings_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wi-fi_protected_setup_ui_api" long-name="wi-fi_protected_setup_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan_eap_settings_ui_api" long-name="wlan_eap_settings_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wpa_security_settings_ui_api" long-name="wpa_security_settings_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
      </component>
     </collection>
@@ -6779,561 +6977,588 @@
    <block long-name="Location Services" level="specific" name="locationsrv" levels="plugins fw interface">
     <collection name="landmarks" long-name="Landmarks" level="fw">
      <component name="locationlandmarks" long-name="Location Landmarks">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks" long-name="landmarks">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clientlib" long-name="clientlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/clientlib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="converter" long-name="converter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/converter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbmanclientlib" long-name="dbmanclientlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/dbmanclientlib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbmanprov" long-name="dbmanprov">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/dbmanprov/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbreg" long-name="dbreg">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/dbreg/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="internalservices" long-name="internalservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/internalservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localaccess" long-name="localaccess">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/localaccess/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localaccessprov" long-name="localaccessprov">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/localaccessprov/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localdbmanprov" long-name="localdbmanprov">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/localdbmanprov/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localsearchprov" long-name="localsearchprov">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/localsearchprov/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multidbsearch" long-name="multidbsearch">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/multidbsearch/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="recognizer" long-name="recognizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/recognizer/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/recognizer/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchclientlib" long-name="searchclientlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/searchclientlib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serverclientlib" long-name="serverclientlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/serverclientlib/group"/>
      </component>
     </collection>
     <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
      <component name="aiwprovider" long-name="Application Inter-Working Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
      </component>
      <component name="library" long-name="Library">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationmapnavfw" long-name="locationmapnavfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
      </component>
     </collection>
     <collection name="locationsystemui" long-name="Location System UI" level="interface">
      <component name="locationsysui" long-name="Location Sys UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationsystemui" long-name="locationsystemui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lc" long-name="lc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/lc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcapp" long-name="lcapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/lc/lcapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcserver" long-name="lcserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/lc/lcserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcservice" long-name="lcservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/lc/lcservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcutils" long-name="lcutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/lc/lcutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locblidsatelliteinfo" long-name="locblidsatelliteinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locblidsatelliteinfo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locbtnotifier" long-name="locbtnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locbtnotifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locgpsindicatorplugin" long-name="locgpsindicatorplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locgpsindicatorplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locnotprefplugin" long-name="locnotprefplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locnotprefplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locpossettingsapp" long-name="locpossettingsapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locpossettingsapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locpsysettings" long-name="locpsysettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locpsysettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locpsysettingseng" long-name="locpsysettingseng">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locpsysettingsui" long-name="locpsysettingsui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsettingsuiservice" long-name="locsettingsuiservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsettingsuiservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsettingsuiclient" long-name="locsettingsuiclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsettingsuiserver" long-name="locsettingsuiserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsuplsettingsui" long-name="locsuplsettingsui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsuplsettingsui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsysuiengine" long-name="locsysuiengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsysuiengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsysuiview" long-name="locsysuiview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locsysuiview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locutils" long-name="locutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locverifier" long-name="locverifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/locverifier/group"/>
      </component>
     </collection>
     <collection name="locationtriggering" long-name="Location Triggering" level="interface">
      <component name="lbtmgmtui" long-name="LBT Management UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
      </component>
      <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
      </component>
      <component name="ltclientlib" long-name="LT Client Lib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
      </component>
      <component name="ltcontainer" long-name="LT Container">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
      </component>
      <component name="ltlogger" long-name="LT Logger">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
      </component>
      <component name="ltmanagementlib" long-name="LT Management Library">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
      </component>
      <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
      </component>
      <component name="ltserver" long-name="LT Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
      </component>
      <component name="ltstrategyengine" long-name="LT Strategy Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
      </component>
      <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationtriggering" long-name="locationtriggering">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ltservercore" long-name="ltservercore">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltserver/ltservercore/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ltserverlogic" long-name="ltserverlogic">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltserver/ltserverlogic/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ltserverlogicbase" long-name="ltserverlogicbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locationtriggering/ltserver/ltserverlogicbase/group"/>
      </component>
     </collection>
     <collection name="supl" long-name="SUPL" level="plugins">
      <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/group"/>
      </component>
      <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
      </component>
      <component name="locationsuplfw" long-name="Location SUPL Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl" long-name="supl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="epos_comasuplpostestermodulecfg" long-name="epos_comasuplpostestermodulecfg">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/epos_comasuplpostestermodulecfg/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="epos_comasuplpostestermodulecfg_exe" long-name="epos_comasuplpostestermodulecfg_exe">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/epos_comasuplpostestermodulecfg_exe/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asnconverterpluginapi" long-name="asnconverterpluginapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/asnconverterpluginapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asnpluginimplementation" long-name="asnpluginimplementation">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/asnpluginimplementation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecom" long-name="ecom">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/notifier/ecom/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/SysLibs/ecom/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notifier" long-name="notifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/notifier/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/notifier/notifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="posmsgpluginapi" long-name="posmsgpluginapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/posmsgpluginapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="protocolhandler" long-name="protocolhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/protocolhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioninghandler" long-name="provisioninghandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/provisioninghandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supllistener" long-name="supllistener">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/supllistener/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmlprovhandler" long-name="syncmlprovhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/syncmlprovhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="waplistener" long-name="waplistener">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/waplistener/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="configparamapi" long-name="configparamapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/configparamapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gateway" long-name="gateway">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/gateway/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nwinitiationapi" long-name="nwinitiationapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/nwinitiationapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="protocolhandlerapi" long-name="protocolhandlerapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/protocolhandlerapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingsapi" long-name="settingsapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/settingsapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="terminalinitiationapi" long-name="terminalinitiationapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/terminalinitiationapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utilities" long-name="utilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/utilities/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="locationsrv" long-name="locationsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationsrv" long-name="locationsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="genericpositioningplugins" long-name="genericpositioningplugins">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="genericpositioningplugins" long-name="genericpositioningplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="locsrv_plat" long-name="locsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="geocoding_api" long-name="geocoding_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsrv_plat" long-name="locsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_category_definition_api" long-name="landmarks_category_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_centre_api" long-name="location_centre_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_notation_preferences_settings_api" long-name="location_notation_preferences_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_settings_launch_api" long-name="location_settings_launch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_triggering_extension_api" long-name="location_triggering_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_triggering_management_api" long-name="location_triggering_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_triggering_status_information_api" long-name="location_triggering_status_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_and_navigation_aiw_api" long-name="map_and_navigation_aiw_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_and_navigation_api" long-name="map_and_navigation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_and_navigation_provider_api" long-name="map_and_navigation_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_and_navigation_provider_discovery_api" long-name="map_and_navigation_provider_discovery_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_image_api" long-name="map_image_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="map_image_conversion_plugin_api" long-name="map_image_conversion_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="np_proxy_configuration_api" long-name="np_proxy_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_supl_asn_codec_api" long-name="oma_supl_asn_codec_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_supl_configuration_parameter_api" long-name="oma_supl_configuration_parameter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="privacy_notifiers_secondary_display_api" long-name="privacy_notifiers_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="psy_configuration_ui_plugin_api" long-name="psy_configuration_ui_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_network_initiation_api" long-name="supl_network_initiation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_pos_message_plugin_api" long-name="supl_pos_message_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_query_secondary_display_api" long-name="supl_query_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_settings_api" long-name="supl_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_settings_notifier_secondary_display_api" long-name="supl_settings_notifier_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supl_terminal_initiation_api" long-name="supl_terminal_initiation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="locsrv_pub" long-name="locsrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="blid_application_satellite_info_api" long-name="blid_application_satellite_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locsrv_pub" long-name="locsrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_api" long-name="landmarks_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_database_management_api" long-name="landmarks_database_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_search_api" long-name="landmarks_search_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_centre_registration_api" long-name="location_centre_registration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/location_centre_registration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_triggering_api" long-name="location_triggering_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
      </component>
     </collection>
@@ -7341,262 +7566,280 @@
    <block long-name="IP Connectivity Management" level="generic" name="ipconnmgmt" levels="plugin framework server generic utils">
     <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
      <component name="apcontrollistplugin" long-name="Access Point Control List Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
      </component>
     </collection>
     <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
      <component name="pdpcontextmanager2" long-name="PDP Context Manager 2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alwayson_net_plugin" long-name="alwayson_net_plugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/group"/>
      </component>
     </collection>
     <collection name="apengine" long-name="Application Engine" level="framework">
      <component name="apeng" long-name="Access Point Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
      </component>
      <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
      </component>
      <component name="apsettingsplugin" long-name="Access Point Settings Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="apengine" long-name="apengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/apengine/group"/>
      </component>
     </collection>
     <collection name="bearermanagement" long-name="Bearer Management" level="framework">
      <component name="bearermanager" long-name="Bearer Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
      </component>
      <component name="mpm" long-name="MPM">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bearermanagement" long-name="bearermanagement">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/bearermanagement/group"/>
      </component>
     </collection>
     <collection name="cmmanager" long-name="CM Manager" level="framework">
      <component name="cmmgr" long-name="CM Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="database" long-name="database">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/database/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Framework" long-name="Framework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Framework/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmpluginembdestination" long-name="cmpluginembdestination">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/cmpluginembdestination/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmpluginlan" long-name="cmpluginlan">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/cmpluginlan/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmpluginpacketdata" long-name="cmpluginpacketdata">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/cmpluginpacketdata/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmpluginvpn" long-name="cmpluginvpn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/cmpluginvpn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmpluginwlan" long-name="cmpluginwlan">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/cmpluginwlan/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Plugins" long-name="Plugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/Plugins/Group"/>
      </component>
     </collection>
     <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
      <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
      </component>
      <component name="connectionmonitorui" long-name="Connection Monitor UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
      </component>
      <component name="connmon" long-name="Connection Monitor">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/group"/>
      </component>
      <component name="connmonext" long-name="Connection Monitor Ext">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connectionmonitor" long-name="connectionmonitor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dataconnectionlogger" long-name="dataconnectionlogger">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connectionmonitoring" long-name="connectionmonitoring">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/group"/>
      </component>
     </collection>
     <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
      <component name="connectiondialogs" long-name="ConnectionDialogs">
-      <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ConnectionDialogs" long-name="ConnectionDialogs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/ipconnmgmt/connectionutilities/ConnectionDialogs/group"/>
      </component>
     </collection>
     <collection name="dbcreator" long-name="DB Creator" level="utils">
      <component name="commsdatcreator" long-name="Comms Database Creator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
      </component>
      <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
      </component>
      <component name="commsdatstartup" long-name="Comms Database Startup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
      </component>
      <component name="dbcreatorexe" long-name="DB Creator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbcreator" long-name="dbcreator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipconnmgmt" long-name="ipconnmgmt">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipconnmgmt" long-name="ipconnmgmt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipcm_plat" long-name="ipcm_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="access_point_engine_misc_api" long-name="access_point_engine_misc_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bearer_settings_plugin_api" long-name="bearer_settings_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commsdat_wlan_api" long-name="commsdat_wlan_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_monitor_extension_api" long-name="connection_monitor_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_ui_utilities_api" long-name="connection_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="disconnect_dialog_api" long-name="disconnect_dialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="disconnect_dialog_disable_api" long-name="disconnect_dialog_disable_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_connection_settings_api" long-name="extended_connection_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipcm_plat" long-name="ipcm_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpm_connect_screen_api" long-name="mpm_connect_screen_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpm_default_connection_api" long-name="mpm_default_connection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdpcontextmanager2_reset_factory_settings_api" long-name="pdpcontextmanager2_reset_factory_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdpcontextmanager2_settings_api" long-name="pdpcontextmanager2_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipcm_pub" long-name="ipcm_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="access_point_engine_api" long-name="access_point_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="access_point_settings_handler_api" long-name="access_point_settings_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="agent_dialog_api" long-name="agent_dialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_monitor_server_api" long-name="connection_monitor_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_settings_api" long-name="connection_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_settings_ui_api" long-name="connection_settings_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="data_connection_log_counters_api" long-name="data_connection_log_counters_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipcm_pub" long-name="ipcm_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
      </component>
     </collection>
@@ -7604,106 +7847,144 @@
    <block long-name="High-level Internet Protocols" level="generic" name="netprotocols" levels="plugin framework server generic specific">
     <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
      <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
      </component>
      <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" plugin="Y" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
      </component>
      <component name="httptransportplugins" long-name="HTTP Transport Plugins" plugin="Y" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
      </component>
      <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
      </component>
     </collection>
     <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
      <component name="ftpengine" long-name="FTP Engine" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
      </component>
      <component name="httpexamples" long-name="HTTP Examples" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
      </component>
      <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
      </component>
      <component name="telnetengine" long-name="Telnet Engine" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
      </component>
      <component name="wapbase" long-name="WAP Base" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
      </component>
      <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
      </component>
     </collection>
     <collection name="wapstack" long-name="WAP Stack" level="plugin">
      <component name="wapmessageapi" long-name="WAP Message API">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
      </component>
     </collection>
     <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
      <component name="Cookie">
-      <unit bldFile="mw/netprotocols/httpfilters/Cookie/group"/>
      </component>
      <component name="HttpFilterAcceptHeader" long-name="HTTP Filter Accept Header">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterAcceptHeader/group"/>
      </component>
      <component name="HttpFilterAuthentication" long-name="HTTP Filter Authentication">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterAuthentication/group"/>
      </component>
      <component name="HttpFilterCommon" long-name="HTTP Filter Common">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterCommon/group"/>
      </component>
      <component name="HttpFilterConnHandler" long-name="HTTP Filter Conn Handler">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterConnHandler/group"/>
      </component>
      <component name="HttpFilterIop" long-name="HTTP Filter Iop">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterIop/group"/>
      </component>
      <component name="HttpFilterProxy" long-name="HTTP Filter Proxy">
-      <unit bldFile="mw/netprotocols/httpfilters/HttpFilterProxy/group"/>
      </component>
      <component name="deflatefilter" long-name="Deflate Filter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
      </component>
      <component name="uaproffilter" long-name="UAProf Filter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cookie" long-name="cookie">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/cookie/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="httpfilters" long-name="httpfilters">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/httpfilters/group"/>
      </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfilteracceptheader" long-name="httpfilteracceptheader">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfilterauthentication" long-name="httpfilterauthentication">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfiltercommon" long-name="httpfiltercommon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfilterconnhandler" long-name="httpfilterconnhandler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfilteriop" long-name="httpfilteriop">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="httpfilterproxy" long-name="httpfilterproxy">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="netprotocols" long-name="netprotocols">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netprotocols" long-name="netprotocols">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="netprotocols_plat" long-name="netprotocols_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cookie_manager_api" long-name="cookie_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netprotocols_plat" long-name="netprotocols_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="http_cache_mgr_api" long-name="http_cache_mgr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="http_filters_api" long-name="http_filters_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
      </component>
     </collection>
@@ -7711,90 +7992,103 @@
    <block long-name="IP App Protocols" level="generic" name="ipappprotocols" levels="plugin framework server generic specific">
     <collection name="sipconnproviderplugins" long-name="SIP Connection Provider Plugins" level="conn">
      <component name="sipconnectionplugins" long-name="SIP Connection Plugins" plugin="Y" introduced="tb92" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnectionplugins/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnectionplugins/group/mm-protocols_sipproviders.mrp"/>
      </component>
      <component name="sipconnprovider" long-name="SIP Connection Provider" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group/mm-protocols_SIPCPR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group/mm-protocols_SIPCPR.mrp"/>
      </component>
      <component name="sipdummyprt" long-name="SIP Dummy PRT" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group/mm-protocols_SIPDummyPRT.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group/mm-protocols_SIPDummyPRT.mrp"/>
      </component>
      <component name="sipparams" long-name="SIP Params" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipparams/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipparams/group/mm-protocols_SIPParams.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipparams/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipparams/group/mm-protocols_SIPParams.mrp"/>
      </component>
      <component name="sipstatemachine" long-name="SIP State Machine" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group/mm-protocols_SipStateMachine.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group/mm-protocols_SipStateMachine.mrp"/>
      </component>
      <component name="sipsubconnprovider" long-name="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group/mm-protocols_SIPSCPR.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group/mm-protocols_SIPSCPR.mrp"/>
      </component>
     </collection>
     <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
      <component name="rtp" long-name="RTP" introduced="9.0">
       <!-- Real Time Data Protocol -->
-      <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/transport/rtp"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/rtp/group"/>
      </component>
      <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt">
-      <unit version="2" bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
      </component>
     </collection>
     <collection name="rtp" long-name="RTP" level="server">
      <component name="rtpstack" long-name="RTP Stack">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
      </component>
      <component name="srtpstack" long-name="SRTP Stack">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
      </component>
     </collection>
     <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
      <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
      </component>
      <component name="sippsipadapter" long-name="SIP Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
      </component>
      <component name="sippsipsettingsui" long-name="SIP Settings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
      </component>
      <component name="sippsystemstatemonitor" long-name="SIP System State Monitor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
      </component>
      <component name="sippwlanplugin" long-name="SIP WLAN Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sipplugins" long-name="sipplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/sipplugins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipappprotocols" long-name="ipappprotocols">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappprotocols" long-name="ipappprotocols">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipappprotocols_plat" long-name="ipappprotocols_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappprotocols_plat" long-name="ipappprotocols_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtprtcp_api" long-name="rtprtcp_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srtp_api" long-name="srtp_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
      </component>
     </collection>
@@ -7802,133 +8096,139 @@
    <block long-name="Wireless Access" level="specific" name="wirelessacc" levels="framework generic ui">
     <collection name="connectscreen" long-name="Connect Screen" level="ui">
      <component name="connectscreen compo" long-name="Connect Screen Component">
-      <unit bldFile="mw/wirelessacc/connectscreen/connectscreen compo/group"/>
      </component>
     </collection>
     <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
      <component name="HotSpotServer.exe=binary" long-name="HotSpot Server EXE">
-      <unit bldFile="mw/wirelessacc/hotspotfw/group"/>
      </component>
      <component name="NetCfgExtnHotSpot.dll=binary" long-name="Net Config Extension HotSpot">
-<!--       <unit bldFile="mw/wirelessacc/hotspotfw/group"/> -->
      </component>
      <component name="hotspotclient.dll=binary" long-name="HotSpot Client">
-<!--       <unit bldFile="mw/wirelessacc/hotspotfw/group"/> -->
      </component>
      <component name="hsbrowser" long-name="HotSpot Browser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/>
      </component>
      <component name="hspluginforagent" long-name="HotSpot Plugin For Agent">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/>
      </component>
      <component name="hsserver" long-name="HotSpot Server">
-      <unit bldFile="mw/wirelessacc/hotspotfw/hsserver/group"/>
      </component>
      <component name="hssmgmtimpl.dll=binary" long-name="HotSpot Management Imlpementation">
-<!--       <unit bldFile="mw/wirelessacc/hotspotfw/group"/> -->
      </component>
      <component name="hssscanlist.lib=binary" long-name="HotSpot Scan List">
-<!--       <unit bldFile="mw/wirelessacc/hotspotfw/group"/> -->
      </component>
      <component name="ictsdialogs" long-name="ICTS Dialogs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/>
      </component>
      <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="hotspotfw" long-name="hotspotfw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/wirelessacc/hotspotfw/group"/>
+     </component>
     </collection>
     <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
      <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
      </component>
      <component name="wlanplugin" long-name="WLAN Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
      </component>
      <component name="wlansettingsui" long-name="WLAN Settings UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
      </component>
      <component name="wlansniffer" long-name="WLAN Sniffer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlanutilities" long-name="wlanutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aihelper" long-name="aihelper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/aihelper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiplugin" long-name="aiplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/aiplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="apwizard" long-name="apwizard">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/apwizard/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mainapplication" long-name="mainapplication">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/mainapplication/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="model" long-name="model">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/model/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="widget" long-name="widget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/widget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlaninfo" long-name="wlaninfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/wlaninfo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlaninfosorting" long-name="wlaninfosorting">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/wlaninfosorting/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="wirelessacc" long-name="wirelessacc">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wirelessacc" long-name="wirelessacc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="hsfw_plat" long-name="hsfw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hsfw_plat" long-name="hsfw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hotspot_framework_client_api" long-name="hotspot_framework_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hotspot_framework_client_plugin_api" long-name="hotspot_framework_client_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="internet_connectivity_test_service_api" long-name="internet_connectivity_test_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="internet_connectivity_test_service_settings_api" long-name="internet_connectivity_test_service_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
      </component>
     </collection>
@@ -7936,170 +8236,214 @@
    <block long-name="VPN Client" level="specific" name="vpnclient" levels="engine ui api">
     <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
      <component name="vpnapi.dll=binary" long-name="VPN API">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="vpnapiimpl" long-name="vpnapiimpl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
      </component>
     </collection>
     <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
      <component name="vpnclient_sis compo" long-name="VPN Client SIS Component">
-      <unit bldFile="mw/vpnclient/vpnclient_sis/vpnclient_sis compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vpnclient_sis" long-name="vpnclient_sis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnclient_sis/group"/>
      </component>
     </collection>
     <collection name="vpnengine" long-name="VPN Engine" level="engine">
      <component name="acuagent" long-name="ACU Agent">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acuagent/group"/>
      </component>
      <component name="acuagentcrypto" long-name="ACU Agent Crypto">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acuagentcrypto/group"/>
      </component>
      <component name="acuagentmessage" long-name="ACU Agent Message">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acuagentmessage/group"/>
      </component>
      <component name="acuagenttransport" long-name="ACU Agent Transport">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acuagenttransport/group"/>
      </component>
      <component name="acuins" long-name="ACU INS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acuins/group"/>
      </component>
      <component name="acupluginlib" long-name="ACU Plugin Lib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/acupluginlib/group"/>
      </component>
      <component name="dmadengine" long-name="DM Adapter Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
      </component>
      <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
      </component>
      <component name="dmadpki" long-name="DM Adapter PKI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
      </component>
      <component name="eventmediator" long-name="Event Mediator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
      </component>
      <component name="eventmediatorapi" long-name="Event Mediator API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
      </component>
      <component name="eventviewer" long-name="Event Viewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
      </component>
      <component name="ikecert" long-name="Ike Cert">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
      </component>
      <component name="ikepolparser" long-name="IKE Policy Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
      </component>
      <component name="ikesocketplugin" long-name="IKE Socket Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikesocketplugin/group"/>
      </component>
      <component name="ikev1lib" long-name="Ikev1 Library">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
      </component>
      <component name="ikev2lib" long-name="Ikev2 Library">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
      </component>
      <component name="ipsecacuplugin" long-name="IPseca Cu Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ipsecacuplugin/group"/>
      </component>
      <component name="kmdapi" long-name="KMD API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
      </component>
      <component name="kmdserver" long-name="Kmd Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
      </component>
      <component name="pkiservice" long-name="PKI Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
      </component>
      <component name="pkiserviceapi" long-name="PKI Service API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
      </component>
      <component name="sit" long-name="Sit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
      </component>
      <component name="utlbase64" long-name="UTL Base64">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
      </component>
      <component name="utlcrypto" long-name="UTL Crypto">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
      </component>
      <component name="utlpkcs10" long-name="UTL PKCS10">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
      </component>
      <component name="utlpkcs12" long-name="UTL PKCS12">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
      </component>
      <component name="utlxml" long-name="UTL XML">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
      </component>
      <component name="vpnawapi" long-name="VPN AW API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnawapi/group"/>
      </component>
      <component name="vpncleaner" long-name="VPN Cleaner">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
      </component>
      <component name="vpnconnagt" long-name="VPN Connagt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
      </component>
      <component name="vpnextapi" long-name="VPN Ext. API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnextapi/group"/>
      </component>
      <component name="vpnins" long-name="VPN Ins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
      </component>
      <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
      </component>
      <component name="vpnmanager" long-name="VPN Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
      </component>
      <component name="vpnnif" long-name="VPN NIF">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpnnif/group"/>
      </component>
      <component name="vpnpfkey" long-name="VPN Pf Key">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnpfkey/group"/>
      </component>
      <component name="vpntcwrapper" long-name="VP NTC Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ikeutils" long-name="ikeutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
      </component>
     </collection>
     <collection name="vpnui" long-name="VPN UI" level="ui">
      <component name="vpndialogmanager" long-name="VPN Dialog Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
      </component>
      <component name="vpnecomnotifier" long-name="VPN ECOM Notifier">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
      </component>
      <component name="vpnmanagementui" long-name="VPN Management UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
      </component>
      <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
      </component>
      <component name="vpnpolins" long-name="VPN Policy Ins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="vpnclient" long-name="vpnclient">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vpnclient" long-name="vpnclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="vpnc_plat" long-name="vpnc_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vpnapi" long-name="vpnapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
      </component>
     </collection>
@@ -8107,186 +8451,223 @@
    <block long-name="IP App Services" level="specific" name="ipappsrv" levels="framework  generic server  conn plugin">
     <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="specific">
      <component name="mmccamrpayloadformat" long-name="AMR Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/>
      </component>
      <component name="mmccanypayloadformat" long-name="ANY Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/>
      </component>
      <component name="mmccanysourcesink" long-name="Anysource Sink">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/>
      </component>
      <component name="mmccavcpayloadformat" long-name="AVC Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/>
      </component>
      <component name="mmcccontroller" long-name="MMCC Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/>
      </component>
      <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/>
      </component>
      <component name="mmccfilesourcesink" long-name="MMCC File Source Sink">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/>
      </component>
      <component name="mmccg711payloadformat" long-name="G711 Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/>
      </component>
      <component name="mmccg729payloadformat" long-name="G729 Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/>
      </component>
      <component name="mmcch263payloadformat" long-name="H263 Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/>
      </component>
      <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/>
      </component>
      <component name="mmccinterface" long-name="MMCC Interface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/>
      </component>
      <component name="mmccjitterbuffer" long-name="Jitter Buffer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/>
      </component>
      <component name="mmccmultiplexer" long-name="MMCC Multiplexer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/>
      </component>
      <component name="mmccqoscontroller" long-name="QoS Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/>
      </component>
      <component name="mmccredpayloadformat" long-name="RED Payload Format">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/>
      </component>
      <component name="mmccrtpsourcesink" long-name="RTP Source Sink">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/>
      </component>
      <component name="mmccsubcontroller" long-name="MMCC Subcontroller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/>
      </component>
      <component name="mmccvideosourcesink" long-name="Video Source Sink">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimediacommscontroller" long-name="multimediacommscontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
      </component>
     </collection>
     <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
      <component name="mmcecli" long-name="MMCE Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/>
      </component>
      <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/>
      </component>
      <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/>
      </component>
      <component name="mmcesrv" long-name="MMCE Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimediacommsengine" long-name="multimediacommsengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
      </component>
     </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
      <component name="natfwclient" long-name="NAT Framework Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/>
      </component>
      <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/>
      </component>
      <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/>
      </component>
      <component name="natfwsettings" long-name="NAT Framework Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/>
      </component>
      <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/>
      </component>
      <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/>
      </component>
      <component name="natfwstunserver" long-name="NAT Framework Stun Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/>
      </component>
      <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/>
      </component>
      <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/>
      </component>
      <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="natfw" long-name="natfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natfw/group"/>
      </component>
     </collection>
     <collection name="natplugins" long-name="NAT Plugins" level="plugin">
      <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
      </component>
      <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
      </component>
      <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
      </component>
      <component name="natptraversalcontroller" long-name="NAT Traversal Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="natplugins" long-name="natplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/natplugins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipappsrv" long-name="ipappsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappsrv" long-name="ipappsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipappsrv_plat" long-name="ipappsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="comms_event_api" long-name="comms_event_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="floor_control_api" long-name="floor_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappsrv_plat" long-name="ipappsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_control_api" long-name="media_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_comms_api" long-name="multimedia_comms_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nat_settings_api" long-name="nat_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="transcoder_api" long-name="transcoder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
      </component>
     </collection>
@@ -8294,535 +8675,561 @@
    <block long-name="Telephony and SIM Services" level="specific" name="phonesrv" levels="plugin framework server generic specific">
     <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
      <component name="CbsServer" long-name="CBS Server">
-      <unit bldFile="mw/phonesrv/cbs/CbsServer/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/cbs/CbsServer/Group"/>
      </component>
      <component name="cbsui" long-name="CBS UI">
-      <unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/cbs/cbsui/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cbs" long-name="cbs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/cbs/group"/>
      </component>
     </collection>
     <collection name="cellular" long-name="Cellular" level="specific">
      <component name="PsetNotesUi" long-name="Pset Notes UI">
-      <unit bldFile="mw/phonesrv/cellular/PsetNotesUi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/cellular/PsetNotesUi/Group"/>
      </component>
      <component name="SSSettings" long-name="SS Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/cellular/SSSettings/group"/>
      </component>
      <component name="ServiceRequest" long-name="Service Request">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/cellular/ServiceRequest/group"/>
      </component>
      <component name="telephonysettings" long-name="Telephony Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cellular" long-name="cellular">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/cellular/group"/>
      </component>
     </collection>
     <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
      <component name="callprovider" long-name="Call Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
      </component>
      <component name="cce" long-name="CCE">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
      </component>
      <component name="cenrepdatabase" long-name="Cenrep Database">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
      </component>
      <component name="csplugin" long-name="CS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
      </component>
      <component name="serviceselector" long-name="Service Selector">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
      </component>
      <component name="spsettings" long-name="SP Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccp" long-name="ccp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/cce/ccp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccpremoteproxybody" long-name="ccpremoteproxybody">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/cce/ccpremoteproxybody/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="icm" long-name="icm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/cce/icm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="convergedcallengine" long-name="convergedcallengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/convergedcallengine/group"/>
      </component>
     </collection>
     <collection name="networkhandling" long-name="Network Handling" level="plugin">
      <component name="networkhandlingengine" long-name="Network Handling Engine">
-      <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkhandling" long-name="networkhandling">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/networkhandling/group"/>
      </component>
     </collection>
     <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
      <component name="CallUI" long-name="Call UI">
-      <unit bldFile="mw/phonesrv/phoneclientserver/CallUI/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/phoneclientserver/CallUI/Group"/>
      </component>
      <component name="EnPolicy" long-name="En Policy">
-      <unit bldFile="mw/phonesrv/phoneclientserver/EnPolicy/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/phoneclientserver/EnPolicy/Group"/>
      </component>
      <component name="aiwdialdata" long-name="AIW Dial Data">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
      </component>
      <component name="dialutils" long-name="Dial Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
      </component>
      <component name="phoneclient" long-name="Phone Client">
-      <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/Group"/>
      </component>
      <component name="phoneserver" long-name="Phones Erver">
-      <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phoneclientserver" long-name="phoneclientserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phoneclientserver/group"/>
      </component>
     </collection>
     <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
      <component name="phonecmdhnlr" long-name="Phone Command Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonecmdhandler" long-name="phonecmdhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonecmdhandler/group"/>
      </component>
     </collection>
     <collection name="satengine" long-name="Sat Engine" level="generic">
      <component name="SatServer" long-name="Sat Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/SatServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="satengine" long-name="satengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CallControlCmd" long-name="CallControlCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/CallControlCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CloseChannelCmd" long-name="CloseChannelCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/CloseChannelCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DisplayTextCmd" long-name="DisplayTextCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/DisplayTextCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GetChannelStatusCmd" long-name="GetChannelStatusCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/GetChannelStatusCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GetInkeyCmd" long-name="GetInkeyCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/GetInkeyCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GetInputCmd" long-name="GetInputCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/GetInputCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LanguageNotificationCmd" long-name="LanguageNotificationCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/LanguageNotificationCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LaunchBrowserCmd" long-name="LaunchBrowserCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/LaunchBrowserCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MoSmControlCmd" long-name="MoSmControlCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/MoSmControlCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OpenChannelCmd" long-name="OpenChannelCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/OpenChannelCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PlayToneCmd" long-name="PlayToneCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/PlayToneCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProvideLocalInfoCmd" long-name="ProvideLocalInfoCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/ProvideLocalInfoCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ReceiveDataCmd" long-name="ReceiveDataCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/ReceiveDataCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RefreshCmd" long-name="RefreshCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/RefreshCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RefreshRequiredCmd" long-name="RefreshRequiredCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/RefreshRequiredCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SelectItemCmd" long-name="SelectItemCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SelectItemCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SendDataCmd" long-name="SendDataCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SendDataCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SendDtmfCmd" long-name="SendDtmfCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SendDtmfCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SendSmCmd" long-name="SendSmCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SendSmCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SendSSCmd" long-name="SendSSCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SendSSCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SendUSSDCmd" long-name="SendUSSDCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SendUSSDCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SetUpCallCmd" long-name="SetUpCallCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SetUpCallCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SetUpEventListCmd" long-name="SetUpEventListCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SetUpEventListCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SetUpIdleModeTextCmd" long-name="SetUpIdleModeTextCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SetUpIdleModeTextCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SetUpMenuCmd" long-name="SetUpMenuCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SetUpMenuCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SimSessionEndCmd" long-name="SimSessionEndCmd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Commands/SimSessionEndCmd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Engine" long-name="Engine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/Engine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EventMonitors" long-name="EventMonitors">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/EventMonitors/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SatClient" long-name="SatClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/SatClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SatInternalClient" long-name="SatInternalClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/SatInternalClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SystemState" long-name="SystemState">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satengine/SatServer/SystemState/group"/>
      </component>
     </collection>
     <collection name="satui" long-name="Sat UI" level="specific">
      <component name="satapp" long-name="Sat App">
-      <unit bldFile="mw/phonesrv/satui/satapp/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/phonesrv/satui/satapp/Group"/>
      </component>
      <component name="satplugin" long-name="Sat Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satui/satplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="satui" long-name="satui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/satui/group"/>
      </component>
     </collection>
     <collection name="telutils" long-name="Utilities" level="generic">
      <component name="phoneparser" long-name="Phone Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/phoneparser/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telutils" long-name="telutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/telutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephonyservice" long-name="telephonyservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phonesrv" long-name="phonesrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonesrv" long-name="phonesrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="engines" long-name="engines">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="engines" long-name="engines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/engines/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vmbxengine" long-name="vmbxengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phonesrv_plat" long-name="phonesrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_dial_data_consumer_api" long-name="aiw_dial_data_consumer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="callui_reconnect_query_api" long-name="callui_reconnect_query_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="call_information_api" long-name="call_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="call_information_mediator_api" long-name="call_information_mediator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cbs_mcn_client_api" long-name="cbs_mcn_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cbs_message_api" long-name="cbs_message_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cenrep_database_api" long-name="cenrep_database_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="converged_call_engine_api" long-name="converged_call_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="converged_call_provider_api" long-name="converged_call_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="default_emergency_numbers_api" long-name="default_emergency_numbers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dial_utils_api" long-name="dial_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonesrv_plat" long-name="phonesrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="incoming_call_monitor_api" long-name="incoming_call_monitor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="network_handling_engine_api" long-name="network_handling_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_api" long-name="phone_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_command_handler_api" long-name="phone_client_command_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_emergency_call_api" long-name="phone_client_emergency_call_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_image_handler_api" long-name="phone_client_image_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_messenger_api" long-name="phone_client_messenger_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_notify_api" long-name="phone_client_notify_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_server_information_api" long-name="phone_client_server_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_ussd_api" long-name="phone_client_ussd_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_ussd_internal_api" long-name="phone_client_ussd_internal_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_client_utility_api" long-name="phone_client_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_settings_api" long-name="phone_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_settings_notes_ui_api" long-name="phone_settings_notes_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_settings_observer_api" long-name="phone_settings_observer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sat_client_api" long-name="sat_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sat_configuration_api" long-name="sat_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sat_refresh_api" long-name="sat_refresh_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sat_service_api" long-name="sat_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="secondary_display_sat_api" long-name="secondary_display_sat_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="service_provider_settings_api" long-name="service_provider_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ss_settings_api" long-name="ss_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="string_parser_api" long-name="string_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_network_information_api" long-name="telephony_network_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voice_mailbox_number_api" long-name="voice_mailbox_number_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voice_mailbox_settings_api" long-name="voice_mailbox_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phonesrv_pub" long-name="phonesrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonesrv_pub" long-name="phonesrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
      </component>
     </collection>
@@ -8830,24 +9237,29 @@
    <block long-name="Messaging Middleware" level="specific" name="messagingmw" levels="stack fw api">
     <collection name="messagingfw" long-name="Messaging FW" level="fw">
      <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
      </component>
      <component name="biowatchers" long-name="BIO Watchers" plugin="Y" introduced="8.0">
-      <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
      </component>
      <component name="msgsrvnstore" long-name="Message Server and Store">
-      <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
      </component>
      <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0">
-      <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
      </component>
      <component name="msgconf" long-name="Messaging Config" introduced="tb91" class="config">
-      <unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
      </component>
      <component name="msgtest" long-name="Messaging Test">
       <!-- XML Previous Location: Application Services/Messaging Application Support/ -->
-      <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
      </component>
      <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92">
       <unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
@@ -8859,128 +9271,136 @@
       <unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
      </component>
      <component name="suplsmshandler" long-name="SUPL SMS Handler" plugin="Y" introduced="tb92">
-      <unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
      </component>
      <component name="suplwappushhandler" long-name="SUPL WAP Push Handler" plugin="Y" introduced="tb92">
-      <unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
      </component>
      <component name="scheduledsendmtm" long-name="Scheduled Send MTM" plugin="Y" introduced="6.0">
-      <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
      </component>
      <component name="sendas" long-name="Send As">
-      <unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
      </component>
      <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1">
-      <unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
      </component>
      <component name="watcherfw" long-name="Watcher Framework">
-      <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
      </component>
      <component name="alwaysonline" long-name="Always Online">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
      </component>
      <component name="msgcommonutils" long-name="Messaging Common Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AlwaysOnlineManager" long-name="AlwaysOnlineManager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/AlwaysOnlineManager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AlwaysOnlineStarterApp" long-name="AlwaysOnlineStarterApp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/AlwaysOnlineStarterApp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagingfw" long-name="messagingfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="datautils" long-name="datautils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/datautils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="senduiservices" long-name="senduiservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="launcher" long-name="launcher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/launcher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceresolver" long-name="serviceresolver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="watcher" long-name="watcher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/watcher/group"/>
      </component>
     </collection>
     <collection name="msgbranched" long-name="Messaging Branched" level="fw">
      <component name="msgbranched.lib=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="msgbranched" long-name="msgbranched">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgbranched/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="messagingmw" long-name="messagingmw">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagingmw" long-name="messagingmw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="msgfw_plat" long-name="msgfw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="always_online_client_api" long-name="always_online_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="always_online_plugin_api" long-name="always_online_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msgfw_plat" long-name="msgfw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msg_common_utils_api" long-name="msg_common_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="send_ui_datautils_api" long-name="send_ui_datautils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="send_ui_plugin_api" long-name="send_ui_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="msgfw_pub" long-name="msgfw_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msgfw_pub" long-name="msgfw_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="send_ui_api" long-name="send_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
      </component>
     </collection>
@@ -8988,249 +9408,258 @@
    <block long-name="Instant Messaging and Presence Services" level="specific" name="imsrv" levels="plugin framework server generic specific">
     <collection name="brandingserver" long-name="Branding Server" level="specific">
      <component name="bsclient.dll=binary" long-name="BS Client">
-      <unit bldFile="mw/imsrv/brandingserver/group"/>
      </component>
      <component name="bsserver.exe=binary" long-name="BS Server">
-<!--       <unit bldFile="mw/imsrv/brandingserver/group"/> -->
      </component>
      <component name="tools" long-name="Tools">
-      <unit bldFile="mw/imsrv/brandingserver/tools/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/tools/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/tools"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="brandingserver" long-name="brandingserver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/imsrv/brandingserver/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bsimport" long-name="bsimport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/brandingserver/tools/bsimport/group"/>
      </component>
     </collection>
     <collection name="imservices" long-name="IM Services" level="generic">
      <component name="imfeatureplugin" long-name="IM Feature Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
      </component>
      <component name="instantmessagingcache" long-name="Instant Messaging Cache">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
      </component>
      <component name="searchfeatureplugin" long-name="Search Feature Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
      </component>
      <component name="xmppsettingsapi" long-name="XMPP Setting Sapi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
      </component>
      <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imservices" long-name="imservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcimdatamodel" long-name="srcimdatamodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcimfrontend" long-name="srcimfrontend">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcimoperations" long-name="srcimoperations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcimprocessor" long-name="srcimprocessor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dataconvlib" long-name="dataconvlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ossprotocoladaptation" long-name="ossprotocoladaptation">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcsearchdatamodel" long-name="srcsearchdatamodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcsearchfrontend" long-name="srcsearchfrontend">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcsearchoperations" long-name="srcsearchoperations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srcsearchprocessor" long-name="srcsearchprocessor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/>
      </component>
     </collection>
     <collection name="ximpfw" long-name="XIMP Framework" level="framework">
      <component name="core" long-name="Core">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/helix/helix_ren/src/client/core"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/ximpfw/core/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="mw/helix/helix_ren/src/client/core"/>
      </component>
      <component name="presence" long-name="Presence">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/ximpfw/presence/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximpfw" long-name="ximpfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/ximpfw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imsrv" long-name="imsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imsrv" long-name="imsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imsrv_plat" long-name="imsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imsrv_plat" long-name="imsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_cache_client_api" long-name="im_cache_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presence_avabilitytext" long-name="presence_avabilitytext">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_base_api" long-name="ximp_core_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_data_model_api" long-name="ximp_core_data_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_feature_plugin_api" long-name="ximp_core_feature_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_management_api" long-name="ximp_core_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_protocol_plugin_api" long-name="ximp_core_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_core_protocol_plugin_host_api" long-name="ximp_core_protocol_plugin_host_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_im_base_api" long-name="ximp_im_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_im_data_model_api" long-name="ximp_im_data_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_im_management_api" long-name="ximp_im_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_im_protocol_plugin_api" long-name="ximp_im_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_im_protocol_plugin_host_api" long-name="ximp_im_protocol_plugin_host_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_base_api" long-name="ximp_presence_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_cache_api" long-name="ximp_presence_cache_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_data_model_api" long-name="ximp_presence_data_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_management_api" long-name="ximp_presence_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_protocol_plugin_api" long-name="ximp_presence_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_presence_protocol_plugin_host_api" long-name="ximp_presence_protocol_plugin_host_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_search_base_api" long-name="ximp_search_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_search_data_model_api" long-name="ximp_search_data_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_search_management_api" long-name="ximp_search_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_search_protocol_plugin_api" long-name="ximp_search_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ximp_search_protocol_plugin_host_api" long-name="ximp_search_protocol_plugin_host_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmpp_settings_api" long-name="xmpp_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
      </component>
     </collection>
@@ -9238,216 +9667,259 @@
    <block long-name="Legacy Presence Services" level="specific" name="legacypresence" levels="engine fw ui">
     <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
      <component name="msgconnmanager.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="msgconnmanager" long-name="msgconnmanager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
      </component>
     </collection>
     <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
      <component name="simpleplugin.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="presencefwsimpleadpt" long-name="presencefwsimpleadpt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
      </component>
     </collection>
     <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
      <component name="psuigsplugin.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="presencesettingsui" long-name="presencesettingsui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/presencesettingsui/group"/>
      </component>
     </collection>
     <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
      <component name="engine" long-name="Engine">
-      <unit bldFile="mw/legacypresence/simpleengine/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/basiclocationinfodisplay/blid/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/location/landmarksui/engine/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smilengine/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/slideshow/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/engine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/appinstall/ncdengine/engine/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/dtdriver/engine"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/metadataeng/engine"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/simpleengine/engine/group"/>
      </component>
      <component name="presencedm" long-name="Presence DM">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/>
      </component>
      <component name="presenceprovisioning" long-name="Presence Provisioning">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/>
      </component>
      <component name="presencesettingsapi" long-name="Presence Settings API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/>
      </component>
      <component name="siputils" long-name="SIP Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/>
      </component>
      <component name="xdmrlspres" long-name="XDM Rlspres">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/>
      </component>
      <component name="xmlutils" long-name="XML Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simpleengine" long-name="simpleengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpleengine/group"/>
      </component>
     </collection>
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
      <component name="XdmDeviceManagement" long-name="XDM Device Management">
-      <unit bldFile="mw/legacypresence/xdmengine/XdmDeviceManagement/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/XDMEngine/XdmDeviceManagement/group"/>
      </component>
      <component name="XdmEngine.dll=binary" long-name="XDM Engine">
-      <unit bldFile="mw/legacypresence/xdmengine/group"/>
      </component>
      <component name="XdmProvisioning" long-name="XDM Provisioning">
-      <unit bldFile="mw/legacypresence/xdmengine/XdmProvisioning/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/XDMEngine/XdmProvisioning/group"/>
      </component>
      <component name="XdmSettingsApi" long-name="XDM Settings Api">
-      <unit bldFile="mw/legacypresence/xdmengine/XdmSettingsApi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/XDMEngine/XdmSettingsApi/group"/>
      </component>
     </collection>
     <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
      <component name="LocalProtocol" long-name="Local Protocol">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/LocalProtocol/group"/>
      </component>
      <component name="XcapProtocol" long-name="Xcap Protocol">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/group"/>
      </component>
      <component name="XdmXmlParser" long-name="XDM XML Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XdmXmlParser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xdmprotocols" long-name="xdmprotocols">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="LocalOperations" long-name="LocalOperations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/LocalProtocol/LocalOperations/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="XcapAppUsage" long-name="XcapAppUsage">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapAppUsage/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Client" long-name="Client">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapCache/Client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Client/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Server" long-name="Server">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapCache/Server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/radioutility/radioserver/Server/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="XcapHttpTransport" long-name="XcapHttpTransport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapHttpTransport/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="XcapOperations" long-name="XcapOperations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapOperations/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="XcapUtils" long-name="XcapUtils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/XcapUtils/group"/>
      </component>
     </collection>
     <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
      <component name="GSXDMPlugin.dll=binary">
-      <unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="legacypresence" long-name="legacypresence">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="legacypresence" long-name="legacypresence">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="XDMEngine" long-name="XDMEngine">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="XDMEngine" long-name="XDMEngine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/XDMEngine/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="XDMSettingsUI" long-name="XDMSettingsUI">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="XDMSettingsUI" long-name="XDMSettingsUI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/legacypresence/XDMSettingsUI/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="pressrv_plat" long-name="pressrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="authorization_api" long-name="authorization_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pressrv_plat" long-name="pressrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_connection_manager_api" long-name="messaging_connection_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presence_list_api" long-name="presence_list_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="publisher_api" long-name="publisher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="registration_api" long-name="registration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simple_documents_api" long-name="simple_documents_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simple_settings_api" long-name="simple_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="watcher_api" long-name="watcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="watcher_info_api" long-name="watcher_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xdm_api" long-name="xdm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xdm_protocol_plugin_api" long-name="xdm_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xdm_settings_api" long-name="xdm_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="simpledatamodeladapter" long-name="simpledatamodeladapter">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simpledatamodeladapter" long-name="simpledatamodeladapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
      </component>
     </collection>
@@ -9455,61 +9927,65 @@
    <block long-name="Open Services" level="specific" name="opensrv" levels="empty 1">
     <collection name="loudmouth" long-name="Loudmouth" level="1">
      <component name="loudmouth.DLL=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="loudmouth" long-name="loudmouth">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/loudmouth/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="opensrv" long-name="opensrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="opensrv" long-name="opensrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="isolationserver" long-name="isolationserver">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="isolationserver" long-name="isolationserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/isolationserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="isoserver" long-name="isoserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagequeue" long-name="messagequeue">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="libtelepathy" long-name="libtelepathy">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="libtelepathy" long-name="libtelepathy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/libtelepathy/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="opensrv_plat" long-name="opensrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="opensrv_plat" long-name="opensrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/opensrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagequeue_api" long-name="messagequeue_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="telepathygabble" long-name="telepathygabble">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telepathygabble" long-name="telepathygabble">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/opensrv/telepathygabble/group"/>
      </component>
     </collection>
@@ -9517,696 +9993,702 @@
    <block long-name="Remote Management" level="specific" name="remotemgmt" levels="plugin framework server generic specific">
     <collection name="remotemgmttest" long-name="Remote Management Test" level="specific">
      <component name="omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" class="test">
-      <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/>
      </component>
      <component name="omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" class="test">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
      </component>
     </collection>
     <collection name="syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
      <component name="clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/>
      </component>
      <component name="devicemgmtfw" long-name="Device Management Framework" introduced="8.0">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/>
      </component>
      <component name="omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/>
      </component>
      <component name="omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/>
      </component>
      <component name="omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/>
      </component>
      <component name="omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/>
      </component>
     </collection>
     <collection name="syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
      <component name="clientprovisioningadaptors" long-name="Client Provisioning Adaptors" plugin="Y" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/>
      </component>
      <component name="datasyncadaptors" long-name="Data Sync Adaptors" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/>
      </component>
      <component name="devicemgmtadaptors" long-name="Device Management Adaptors" plugin="Y" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/>
      </component>
     </collection>
     <collection name="ahle" long-name="Adaptive History List" level="generic">
      <component name="ahleclient" long-name="Adaptive History List Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/ahle/ahleclient/group"/>
      </component>
      <component name="ahleserver" long-name="Adaptive History List Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/ahle/ahleserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ahle" long-name="ahle">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/ahle/group"/>
      </component>
     </collection>
     <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
      <component name="diagframework" long-name="Diagnostics Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
      </component>
      <component name="diagpluginbase" long-name="Diagnostics Plugin Base">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
      </component>
      <component name="diagresultsdb" long-name="Diagnostics Results DB">
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicediagnosticsfw" long-name="devicediagnosticsfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
      </component>
     </collection>
     <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
      <component name="pnputil">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
      </component>
      <component name="provisioning" long-name="provisioning">
-      <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omaprovisioning" long-name="omaprovisioning">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/omaprovisioning/group"/>
      </component>
     </collection>
     <collection name="policymanagement" long-name="Policy Management" level="generic">
      <component name="tarmpolicymng" long-name="Tarm Policy Mng">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="policymanagement" long-name="policymanagement">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/policymanagement/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmutilserver" long-name="dmutilserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/dmutilserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pmdmadapter" long-name="pmdmadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/pmdmadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="policyengine" long-name="policyengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/policyengine/group"/>
      </component>
     </collection>
     <collection name="syncmlfw" long-name="SyncML Framework" level="server">
      <component name="common" long-name="Common">
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/products/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/java/javaruntime/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/java/javautils/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/common/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/clientapps/symbianMmf/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/amr/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/audio/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp4/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/audio/codec/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/dtdriver/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/dtdriver/decoder/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/wm/common"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/harvester/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/metadataengine/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/commonframework/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/flashrtpolicyserver/common/group"/>
      </component>
      <component name="dm" long-name="DM">
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/bld"/>
      </component>
      <component name="ds" long-name="DS">
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alerthandler" long-name="alerthandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/alerthandler/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alertqueue" long-name="alertqueue">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="debug" long-name="debug">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/debug/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="historylog" long-name="historylog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/historylog/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="http" long-name="http">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/http/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="inc" long-name="inc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/inc"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/notifiers/inc"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/inc"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/inc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="modifiedheaders" long-name="modifiedheaders">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/modifiedheaders"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="policy" long-name="policy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/policy"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="symbianheaders" long-name="symbianheaders">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/symbianheaders"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obexclient" long-name="obexclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexclient/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obexcommserver" long-name="obexcommserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexcommserver/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obexdmplugin" long-name="obexdmplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdmplugin/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obexdsplugin" long-name="obexdsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdsplugin/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obexserverbinding" long-name="obexserverbinding">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexserverbinding/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sosserver" long-name="sosserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sosserver_clientapi" long-name="sosserver_clientapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_clientapi/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sosserver_privateapi" long-name="sosserver_privateapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_privateapi/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sosserver_transporthandler" long-name="sosserver_transporthandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_transporthandler/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncagent" long-name="syncagent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/syncagent/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="transport" long-name="transport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/transport/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wbxml" long-name="wbxml">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml" long-name="xml">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/common/xml/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="callbackServer" long-name="callbackServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/callbackServer/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmutils" long-name="dmutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmhostserverbase" long-name="dmhostserverbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmhostservers" long-name="dmhostservers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostservers/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioningadapter" long-name="provisioningadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/provisioningadapter/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings" long-name="settings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/settings/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/settings/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="treedbclient" long-name="treedbclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="treedbhandler" long-name="treedbhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="treemodule" long-name="treemodule">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wappushalert" long-name="wappushalert">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adapterlog" long-name="adapterlog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dataproviderbase" long-name="dataproviderbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="agentlog" long-name="agentlog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="changefinder" long-name="changefinder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/changefinder/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbcaps" long-name="dbcaps">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/dbcaps/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filter" long-name="filter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filterutils" long-name="filterutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filterutils/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProfileUtil" long-name="ProfileUtil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/ProfileUtil/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="testprofileutil" long-name="testprofileutil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/ProfileUtil/testprofileutil/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="storeformat" long-name="storeformat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/storeformat/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dshostclient" long-name="dshostclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostclient/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dshostserverbase" long-name="dshostserverbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostserverbase/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dshostservers" long-name="dshostservers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netmon" long-name="netmon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ota" long-name="ota">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/ota/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmlfw" long-name="syncmlfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmlnotifier" long-name="syncmlnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncservice" long-name="syncservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/syncmlfw/syncservice/group"/>
      </component>
     </collection>
     <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
      <component name="tarmterminalcontrol" long-name="Tarm Terminal Control">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="terminalsecurity" long-name="terminalsecurity">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPClient" long-name="SCPClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPHistoryPlugin" long-name="SCPHistoryPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPHistoryPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPPatternPlugin" long-name="SCPPatternPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPPatternPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPServer" long-name="SCPServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPTest" long-name="SCPTest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPTest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SCPTimestampPlugin" long-name="SCPTimestampPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/SCP/SCPTimestampPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tcadapter" long-name="tcadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/tcadapter/bld"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remotemgmt" long-name="remotemgmt">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotemgmt" long-name="remotemgmt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="fotaapplication" long-name="fotaapplication">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fmsclient" long-name="fmsclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fmserver" long-name="fmserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FotaRfsPlugin" long-name="FotaRfsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/FotaRfsPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fotastartupextplg" long-name="fotastartupextplg">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fotaserver" long-name="fotaserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fotaapplication" long-name="fotaapplication">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remotemgmt_plat" long-name="remotemgmt_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adaptive_history_list_api" long-name="adaptive_history_list_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adaptive_history_list_session_api" long-name="adaptive_history_list_session_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_agent_util_and_definitions_api" long-name="common_agent_util_and_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="data_synchronization_notification_api" long-name="data_synchronization_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="data_synchronization_plugin_api" long-name="data_synchronization_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="device_management_parameter_api" long-name="device_management_parameter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="device_management_plugin_api" long-name="device_management_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnostics_framework_api" long-name="diagnostics_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnostics_plugin_api" long-name="diagnostics_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnostics_plugin_pool_api" long-name="diagnostics_plugin_pool_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnostics_plugin_utility_api" long-name="diagnostics_plugin_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnostics_results_api" long-name="diagnostics_results_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dm_constant_definitions_api" long-name="dm_constant_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dm_tree_apis" long-name="dm_tree_apis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dm_utils_api" long-name="dm_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ds_constant_definitions_api" long-name="ds_constant_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fota_engine_api" long-name="fota_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotemgmt_plat" long-name="remotemgmt_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obex_client_session_api" long-name="obex_client_session_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_ds_extensions_api" long-name="oma_ds_extensions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_provisioning_adapter_api" long-name="oma_provisioning_adapter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_provisioning_engine_api" long-name="oma_provisioning_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pnpms_utils_api" long-name="pnpms_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="policy_management_certificate_api" long-name="policy_management_certificate_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="policy_management_request_api" long-name="policy_management_request_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scp_server_api" long-name="scp_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="setting_enforcement_info_api" long-name="setting_enforcement_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncml_alert_api" long-name="syncml_alert_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncml_client_api" long-name="syncml_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncml_notifier_api" long-name="syncml_notifier_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncml_notifier_roaming_api" long-name="syncml_notifier_roaming_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sync_alert_handler_api" long-name="sync_alert_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sync_service_api" long-name="sync_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="terminal_security_device_lock_api" long-name="terminal_security_device_lock_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="update_package_storage_plugin_api" long-name="update_package_storage_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remotemgmt_pub" long-name="remotemgmt_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotemgmt_pub" long-name="remotemgmt_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="synchronization_capability_api" long-name="synchronization_capability_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
      </component>
     </collection>
@@ -10214,43 +10696,49 @@
    <block long-name="Networking Device Management" level="generic" name="networkingdm" levels="plugin framework server generic specific">
     <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
      <component name="accesspointadapter" long-name="Access Point Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/clientprovisioning/accesspointadapter/group"/>
      </component>
      <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clientprovisioning" long-name="clientprovisioning">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/clientprovisioning/group"/>
      </component>
     </collection>
     <collection name="devicemanagement" long-name="Device Management" level="specific">
      <component name="globalwlansettings" long-name="Global WLAN Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/globalwlansettings/group"/>
      </component>
      <component name="nsmldinternet" long-name="NSMLD Internet">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group/wpx"/>
      </component>
      <component name="nsmldmalwaysonadapter" long-name="NSMLDM Always-On Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/>
      </component>
      <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicemanagement" long-name="devicemanagement">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/devicemanagement/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="networkingdm" long-name="networkingdm">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkingdm" long-name="networkingdm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/networkingdm/group"/>
      </component>
     </collection>
@@ -10258,48 +10746,60 @@
    <block long-name="Remote Storage" level="generic" name="remotestorage" levels="framework">
     <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
      <component name="mountstore" long-name="Mount Store">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
      </component>
      <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
      </component>
      <component name="remotefileengine" long-name="Remote File Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
      </component>
      <component name="mountmanager" long-name="Mount Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
      </component>
      <component name="webdavaccessplugin" long-name="WebDAV Access Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
      </component>
      <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
      </component>
      <component name="gsplugin" long-name="GS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
      </component>
      <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotestoragefw" long-name="remotestoragefw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remotestorage" long-name="remotestorage">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotestorage" long-name="remotestorage">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="rsfw_plat" long-name="rsfw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rsfw_access_protocol_plugin_api" long-name="rsfw_access_protocol_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
      </component>
     </collection>
@@ -10307,7 +10807,8 @@
    <block long-name="Remote Connectivity" level="generic" name="remoteconn" levels="plugin framework server generic specific">
     <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
      <component name="chatscripts" long-name="Chat Scripts">
-      <unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
      </component>
      <component name="connectqi" long-name="ConnectQI" introduced="9.1" class="PC">
       <unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
@@ -10318,122 +10819,143 @@
     </collection>
     <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
      <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
      </component>
      <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp/connectivity_legacy_plp_plpgrp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp/connectivity_legacy_plp_plpgrp.mrp"/>
      </component>
      <component name="plpvariant" long-name="PLP Variant" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant/connectivity_legacy_plp_plpvariant.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant/connectivity_legacy_plp_plpvariant.mrp"/>
      </component>
      <component name="mrouter" long-name="m-Router" filter="gt">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/>
      </component>
     </collection>
     <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
      <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" plugin="Y" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
      </component>
     </collection>
     <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
      <component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92">
-      <unit bldFile="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group" mrp="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group/connectivity_usbms.mrp"/>
      </component>
     </collection>
     <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
      <component name="backupengine" long-name="Backup Engine" introduced="9.0">
-      <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
      </component>
     </collection>
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
      <component name="SeCon" long-name="Se Con">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connectivitymodules" long-name="connectivitymodules">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="catalogspcconnectivityplugin" long-name="catalogspcconnectivityplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/catalogspcconnectivityplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PCConn" long-name="PCConn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/clients/PCConn/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/servers/PCConn/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cntParser" long-name="cntParser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/cntParser/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FTP" long-name="FTP">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/plugins/FTP/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsconnplugin" long-name="hapticsconnplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/plugins/hapticsconnplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PCconn" long-name="PCconn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/plugins/PCconn/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="csc" long-name="csc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/services/csc/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ftp" long-name="ftp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/services/ftp/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pcd" long-name="pcd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/services/pcd/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conmlhandler" long-name="conmlhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/wbxml/conmlhandler/bld"/>
      </component>
     </collection>
     <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
      <component name="mtpfw" long-name="MTP Framework" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
      </component>
      <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" class="test">
-      <unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
      </component>
     </collection>
     <collection name="mtptransports" long-name="MTP Transports" level="plugin">
      <component name="mtpusbtransport" long-name="MTP USB Transport" plugin="Y" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from System Definition Template -->
+    <collection name="connectivitytest" long-name="connectivitytest">
+     <!-- Following Component added by SF via autopopulating script from System Definition Template -->
+     <component name="connectivityfw" long-name="connectivityfw">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/connectivityapps/connectivityfw/group" mrp="app/techview/connectivityapps/connectivityfw/group/connectivity_framework.mrp"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from System Definition Template -->
+     <component name="connectivityservices" long-name="connectivityservices">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/connectivityapps/connectivityservices/group" mrp="app/techview/connectivityapps/connectivityservices/group/connectivity_services.mrp"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remoteconn" long-name="remoteconn">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remoteconn" long-name="remoteconn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="remoteconn_plat" long-name="remoteconn_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remoteconn_plat" long-name="remoteconn_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
      </component>
     </collection>
@@ -10444,388 +10966,428 @@
    <block long-name="DLNA Services" level="specific" name="dlnasrv" levels="framework server plugin">
     <collection name="homemedia" long-name="Home Media" level="framework">
      <component name="homemedia" long-name="Home Media">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/dlnasrv/homemedia/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homemedia/homemedia/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="mw/dlnasrv/homemedia/group"/>
      </component>
     </collection>
     <collection name="homesync" long-name="Home Sync" level="plugin">
      <component name="contentmanager" long-name="Content Manager">
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmfillmanager" long-name="cmfillmanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmmemorymanager" long-name="cmmemorymanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmscheduler" long-name="cmscheduler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmserver" long-name="cmserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmstoremanager" long-name="cmstoremanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmstoremanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homesyncgsplugin" long-name="homesyncgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homesyncwizard" long-name="homesyncwizard">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncwizard/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="applicationengine" long-name="applicationengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediaservant" long-name="mediaservant">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="plugin" long-name="plugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/plugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homesync" long-name="homesync">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/homesync/group"/>
      </component>
     </collection>
     <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
      <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
      </component>
      <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
      </component>
      <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
      </component>
      <component name="upnpxmlparser" long-name="UPnP XML Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpavcontroller" long-name="upnpavcontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
      </component>
     </collection>
     <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
      <component name="avcontrolframework" long-name="A/V Control Famework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
      </component>
      <component name="avcpengine" long-name="AVCP Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcpengine/group"/>
      </component>
      <component name="avcpengineclient" long-name="Avcp Engine Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcpengineclient/group"/>
      </component>
      <component name="upnpaccessplugin" long-name="UPnP Access Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/upnpaccessplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpavcontrolpoint" long-name="upnpavcontrolpoint">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
      </component>
     </collection>
     <collection name="upnpframework" long-name="UPnP Framework" level="framework">
      <component name="upnpaiwengine" long-name="UPnP AIW Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
      </component>
      <component name="upnpaiwprovider" long-name="UPnP AIW Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
      </component>
      <component name="upnpbrowse" long-name="UPnP Browse">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/group"/>
      </component>
      <component name="upnpcommand" long-name="UPnP Command">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
      </component>
      <component name="upnpcommonui" long-name="UPnP Common UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
      </component>
      <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
      </component>
      <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
      </component>
      <component name="upnpmusicadapter" long-name="UPnP Musicadapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
      </component>
      <component name="upnputilities" long-name="UPnP Utilities">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpframework" long-name="upnpframework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowseaction" long-name="upnpbrowseaction">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/upnpbrowseaction/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowseengine" long-name="upnpbrowseengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/upnpbrowseengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowsemain" long-name="upnpbrowsemain">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/upnpbrowsemain/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowseui" long-name="upnpbrowseui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/upnpbrowseui/group"/>
      </component>
     </collection>
     <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
      <component name="cdssync" long-name="CDS Sync">
-      <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/group"/>
      </component>
      <component name="common">
-      <unit bldFile="mw/dlnasrv/upnpharvester/common/group"/>
      </component>
      <component name="mdhserver" long-name="MDH Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmlibrary" long-name="cmlibrary">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmsettings" long-name="cmsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmsqlwrapper" long-name="cmsqlwrapper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbmanager" long-name="dbmanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpharvester" long-name="upnpharvester">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpharvester/group"/>
      </component>
     </collection>
     <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
      <component name="avobjects" long-name="A/V Objects">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
      </component>
      <component name="connectionmanagerservice" long-name="Connection Manager Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
      </component>
      <component name="contentdirectoryservice" long-name="Content Directory Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
      </component>
      <component name="mediaserverclient" long-name="Media Server Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
      </component>
      <component name="mediaserverengine" long-name="Media Server Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpmediaserver" long-name="upnpmediaserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
      </component>
     </collection>
     <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
      <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpmpxplugins" long-name="upnpmpxplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
      </component>
     </collection>
     <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
      <component name="appwizard" long-name="App Wizard">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
      </component>
      <component name="multiselectionui" long-name="Multi-Selection UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
      </component>
      <component name="upnpgsplugin" long-name="UPnP GS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
      </component>
      <component name="upnpsettingsengine" long-name="UPnP Settings Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
      </component>
      <component name="upnpsharingui" long-name="UPnP Sharing UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpsettings" long-name="upnpsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsettings/group"/>
      </component>
     </collection>
     <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
      <component name="applicationengine" long-name="Application Engine">
-      <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
      </component>
      <component name="upnpcontentserver" long-name="UPnP Content Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
      </component>
      <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
      </component>
      <component name="upnpsecurity" long-name="UPnP Security">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpsharing" long-name="upnpsharing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpsharing/group"/>
      </component>
     </collection>
     <collection name="upnpstack" long-name="UPnP Stack" level="framework">
      <component name="controlpointbase" long-name="Control Point Base">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/group"/>
      </component>
      <component name="dlnawebserver" long-name="DLNA Web Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/dlnawebserver/group"/>
      </component>
      <component name="messagehandler" long-name="Message Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/messagehandler/group"/>
      </component>
      <component name="serviceframework" long-name="Service Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/group"/>
      </component>
      <component name="ssdpserver" long-name="SSDP Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/ssdpserver/group"/>
      </component>
      <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
      </component>
      <component name="upnpconnmanager" long-name="UPnP Connection Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
      </component>
      <component name="upnphttptransfer" long-name="UPnP HTTP Transfer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
      </component>
      <component name="upnputils" long-name="UPnP Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/upnputils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wrapper" long-name="wrapper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/wrapper/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/wrapper/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/upnputils/wrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpstack" long-name="upnpstack">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/upnpstack/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="dlnasrv" long-name="dlnasrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dlnasrv" long-name="dlnasrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="dlnasrv_plat" long-name="dlnasrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dlnasrv_plat" long-name="dlnasrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_avcp_api" long-name="upnp_avcp_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_av_objects_api" long-name="upnp_av_objects_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_command_api" long-name="upnp_command_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_common_api" long-name="upnp_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_control_point_api" long-name="upnp_control_point_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_control_point_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_device_api" long-name="upnp_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_media_server_api" long-name="upnp_media_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_media_server_metadata_api" long-name="upnp_media_server_metadata_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_media_server_settings_api" long-name="upnp_media_server_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_plugin_api" long-name="upnp_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_security_plugin_api" long-name="upnp_security_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnp_utils_api" long-name="upnp_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_utils_api/group"/>
      </component>
     </collection>
@@ -10833,454 +11395,492 @@
    <block long-name="Shortlink Connectivity" level="generic" name="shortlinkconn" levels="framework server generic specific plugin">
     <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
      <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1">
-      <unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
      </component>
     </collection>
     <collection name="obex" long-name="OBEX" level="generic">
      <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2">
-      <unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
      </component>
      <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1">
-      <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
      </component>
     </collection>
     <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
      <component name="btaudioman" long-name="Bluetooth Audio Man">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
      </component>
      <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
      </component>
      <component name="bteng" long-name="Bluetooth Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bteng/group"/>
      </component>
      <component name="bthid" long-name="BTHID">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/group"/>
      </component>
      <component name="btmac" long-name="Bluetooth Mac">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btmac/group"/>
      </component>
      <component name="btnotif" long-name="Bluetooth Notifier">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/group"/>
      </component>
      <component name="btpbap" long-name="Bluetooth PBAP">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btpbap/group"/>
      </component>
      <component name="btsac" long-name="Bluetooth SAC">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btsac/group"/>
      </component>
      <component name="btsap" long-name="Bluetooth SAP">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btsap/group"/>
      </component>
      <component name="btui" long-name="Bluetooth UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bthidclient" long-name="bthidclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/bthidclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bthidengplugin" long-name="bthidengplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/bthidengplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bthidkbdsettings" long-name="bthidkbdsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/bthidkbdsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bthidserver" long-name="bthidserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/bthidserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="keyboard" long-name="keyboard">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/keyboard/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="layouts" long-name="layouts">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/layouts/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="manager" long-name="manager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/manager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mouse" long-name="mouse">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/mouse/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hidmousedriver" long-name="hidmousedriver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/mouse/hidmousedriver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PaintCursor" long-name="PaintCursor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/mouse/PaintCursor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Sesame_client" long-name="Sesame_client">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/mouse/Sesame_client/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Sesame_server" long-name="Sesame_server">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/mouse/Sesame_server/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devmodel" long-name="devmodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/devmodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Ecom" long-name="Ecom">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/Ecom/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetoothengine" long-name="bluetoothengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/group"/>
      </component>
     </collection>
     <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
      <component name="atext" long-name="Atext">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/atext/group"/>
      </component>
      <component name="dun" long-name="Dun">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
      </component>
      <component name="generichid" long-name="Generic HID">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
      </component>
      <component name="irapp" long-name="Irapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/irapp/group"/>
      </component>
      <component name="lcstylustap" long-name="LC Stylus Tap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
      </component>
      <component name="locod" long-name="Locod">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
      </component>
      <component name="obexreceiveservices" long-name="OBEX Receive Services">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
      </component>
      <component name="obexsendservices" long-name="Obex Send Services">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
      </component>
      <component name="obexserviceman" long-name="Obex Service Man">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="plugins" long-name="plugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/plugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/plugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utils" long-name="utils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/utils/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/utils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localconnectivityservice" long-name="localconnectivityservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="irappgsplugin" long-name="irappgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/irapp/irappgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bip" long-name="bip">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/bip/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtmuibluetooth" long-name="mtmuibluetooth">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/mtmuibluetooth/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtmuiinfrared" long-name="mtmuiinfrared">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/mtmuiinfrared/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="opp" long-name="opp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/opp/group"/>
      </component>
     </collection>
     <collection name="usbclasses" long-name="USB classes" level="framework">
      <component name="pictbridgeengine" long-name="Pictbridge Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
      </component>
      <component name="ptpserver" long-name="Ptp Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/group"/>
      </component>
      <component name="ptpstack" long-name="Ptp Stack">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/ptpstack/group"/>
      </component>
      <component name="sicdusbplugin" long-name="Sicd USB Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
      </component>
      <component name="usbbasicpersonality" long-name="USB Basic Personality">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
      </component>
      <component name="usbmscpersonality" long-name="USB Msc Personality">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
      </component>
      <component name="usbobexclasscontroller" long-name="USB Obex Class Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
      </component>
      <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/usbosdescriptorhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usbclasses" long-name="usbclasses">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptpclasscontroller" long-name="ptpclasscontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/>
      </component>
     </collection>
     <collection name="usbengines" long-name="USB Engines" level="generic">
      <component name="usbdevcon" long-name="USB Devcon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbengines/usbdevcon/group"/>
      </component>
      <component name="usblocodplugin" long-name="USB Locod Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/group"/>
      </component>
      <component name="usbremotepersonality" long-name="USB Remote Personality">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
      </component>
      <component name="usbwatcher" long-name="USB Watcher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbengines/usbwatcher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usbengines" long-name="usbengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbengines/group"/>
      </component>
     </collection>
     <collection name="usbuis" long-name="USB UIs" level="specific">
      <component name="imageprintui" long-name="Image Print UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
      </component>
      <component name="imageprintuiprovider" long-name="Image Print UI Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
      </component>
      <component name="usbui" long-name="USB UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/usbui/group"/>
      </component>
      <component name="usbuinotif" long-name="USB UI Notif">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usbuis" long-name="usbuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="USBClassChangeUIPlugin" long-name="USBClassChangeUIPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/usbuis/usbui/USBClassChangeUIPlugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="shortlinkconn" long-name="shortlinkconn">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinkconn" long-name="shortlinkconn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="shortlinkconn_plat" long-name="shortlinkconn_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="at_command_handler_plugin_api" long-name="at_command_handler_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/at_command_handler_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_dosserver_audio_api" long-name="bluetooth_dosserver_audio_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dosserver_audio_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_dut_mode_api" long-name="bluetooth_dut_mode_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dut_mode_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_api" long-name="bluetooth_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_connection_management_api" long-name="bluetooth_engine_connection_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_connection_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_device_management_api" long-name="bluetooth_engine_device_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_device_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_discovery_api" long-name="bluetooth_engine_discovery_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_discovery_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_plugin_api" long-name="bluetooth_engine_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_engine_settings_api" long-name="bluetooth_engine_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_local_variation_api" long-name="bluetooth_local_variation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_local_variation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_notifier_internal_api" long-name="bluetooth_notifier_internal_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_notifier_internal_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_sap_connection_state_api" long-name="bluetooth_sap_connection_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_sap_connection_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_secondary_display_notification_api" long-name="bluetooth_secondary_display_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_secondary_display_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dialup_connection_status_api" long-name="dialup_connection_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dun_secondary_display_notification_api" long-name="dun_secondary_display_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinkconn_plat" long-name="shortlinkconn_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obex_secondary_display_notification_api" long-name="obex_secondary_display_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obex_service_plugin_api" long-name="obex_service_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="obex_service_utils_api" long-name="obex_service_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pictbridge_api" long-name="pictbridge_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/pictbridge_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptp_responder_api" long-name="ptp_responder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_responder_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptp_server_api" long-name="ptp_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptp_transport_api" long-name="ptp_transport_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_transport_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_device_control_plugin_api" long-name="usb_device_control_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_device_control_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_notifier_api" long-name="usb_notifier_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_notifier_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_personality_api_header" long-name="usb_personality_api_header">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_api_header/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_personality_plugin_api" long-name="usb_personality_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_secondary_display_api" long-name="usb_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_watcher_api" long-name="usb_watcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usb_watcher_info_api_header" long-name="usb_watcher_info_api_header">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_info_api_header/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="shortlinkconn_pub" long-name="shortlinkconn_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_notifier_api" long-name="bluetooth_notifier_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_notifier_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetooth_power_state_api" long-name="bluetooth_power_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_power_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinkconn_pub" long-name="shortlinkconn_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
      </component>
     </collection>
@@ -11288,106 +11888,115 @@
    <block long-name="Image Handling" level="specific" name="imghandling" levels="plugin framework server generic specific">
     <collection name="3gplibrary" long-name="3GP Library" level="server">
      <component name="3gpmp4lib" long-name="3GP MP4 Library">
-      <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gplibrary" long-name="3gplibrary">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/3gplibrary/group"/>
      </component>
     </collection>
     <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
      <component name="IHL.dll=binary" long-name="IHL">
-      <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="imagehandlinglib" long-name="imagehandlinglib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/imghandling/imagehandlinglib/Group"/>
      </component>
     </collection>
     <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
      <component name="imageinfopopup" long-name="Image Info Popup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
      </component>
      <component name="imagepreview" long-name="Image Preview">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/imagepreview/group"/>
      </component>
      <component name="thumbnailmanager" long-name="Thumbnail Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
      </component>
      <component name="tvoutengine" long-name="TV Out Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagehandlingutilities" long-name="imagehandlingutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image" long-name="image">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/plugins/image/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thumbagdaemon" long-name="thumbagdaemon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbagdaemon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thumbnailclient" long-name="thumbnailclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thumbnailserver" long-name="thumbnailserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tmiadrestart" long-name="tmiadrestart">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/tmiadrestart/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imghandling" long-name="imghandling">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imghandling" long-name="imghandling">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imagehandling_plat" long-name="imagehandling_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gp_library_api" long-name="3gp_library_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagehandling_plat" long-name="imagehandling_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_handling_library_api" long-name="image_handling_library_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_info_popup_api" long-name="image_info_popup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/image_info_popup_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_preview_api" long-name="image_preview_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/image_preview_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thumbnailmanager_api" long-name="thumbnailmanager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tvoutengine_api" long-name="tvoutengine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/imghandling/imagehandling_plat/tvoutengine_api/group"/>
      </component>
     </collection>
@@ -11395,101 +12004,100 @@
    <block long-name="Legacy Metadata Services" level="specific" name="metadatasrv" levels="plugin framework server generic specific">
     <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
      <component name="CLFCollectionManagerImpl.dll=binary">
-      <unit bldFile="mw/metadatasrv/contentlistingframework/group"/>
      </component>
      <component name="CLFDefaultSource.dll=binary">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="CLFMetaDataManager.dll=binary">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="CLFMimeTypeManager.dll=binary">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="CLFUtils.dll=binary" long-name="CLF Utils">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="ContentListingFramework.dll=binary" long-name="Content Listing Framework DLL">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="ContentListingServer.exe=binary">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
      </component>
      <component name="MediaCollectionManager.dll=binary" long-name="Media Collection Manager DLL">
-<!--       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="contentlistingframework" long-name="contentlistingframework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/metadatasrv/contentlistingframework/group"/>
      </component>
     </collection>
     <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
      <component name="mediastylegrid" long-name="Media Style Grid">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediamanagementuis" long-name="mediamanagementuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/mediamanagementuis/group"/>
      </component>
     </collection>
     <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
      <component name="mediafetch" long-name="Media Fetch">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediamanagementutilities" long-name="mediamanagementutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="metadatasrv" long-name="metadatasrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadatasrv" long-name="metadatasrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="metadatasrv_plat" long-name="metadatasrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_collection_manager_api" long-name="content_listing_framework_collection_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_extended_api" long-name="content_listing_framework_extended_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadatasrv_plat" long-name="metadatasrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_fetch_implementation_api" long-name="media_fetch_implementation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_style_grid_api" long-name="media_style_grid_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_style_grid_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="metadatasrv_pub" long-name="metadatasrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_api" long-name="content_listing_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadatasrv_pub" long-name="metadatasrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_fetch_api" long-name="media_fetch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
      </component>
     </collection>
@@ -11497,276 +12105,294 @@
    <block long-name="Metadata Services" level="specific" name="mds" levels="mgr eng int">
     <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
      <component name="ContentListingFramework.dll=binary">
-      <unit bldFile="mw/mds/clfwrapper/group"/>
      </component>
      <component name="MediaCollectionManager.dll=binary">
-<!--       <unit bldFile="mw/mds/clfwrapper/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="clfwrapper" long-name="clfwrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/clfwrapper/group"/>
      </component>
     </collection>
     <collection name="contextengine" long-name="Context Engine" level="eng">
      <component name="contextengine.dll=binary">
-      <unit bldFile="mw/mds/contextengine/group"/>
      </component>
      <component name="plugins" long-name="Plugins">
-      <unit bldFile="mw/mds/contextengine/plugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/organizer/searchfw/plugins/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/datasource/plugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/contextengine/plugins/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="contextengine" long-name="contextengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mds/contextengine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendarplugin" long-name="calendarplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/contextengine/plugins/calendarplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contextplugininterface" long-name="contextplugininterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/contextengine/plugins/contextplugininterface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationplugin" long-name="locationplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/contextengine/plugins/locationplugin/group"/>
      </component>
     </collection>
     <collection name="harvester" long-name="Harvester" level="eng">
      <component name="blacklistclient" long-name="Blacklist Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/blacklistclient/group"/>
      </component>
      <component name="blacklistserver" long-name="Blacklist Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/blacklistserver/group"/>
      </component>
      <component name="client" long-name="Client">
-      <unit bldFile="mw/mds/harvester/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/UISettingsSrv/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/client/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_stubs/javaregistry/clientserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/clientserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clockserver/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/logging/client/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
      </component>
      <component name="common">
-      <unit bldFile="mw/mds/harvester/common/group"/>
      </component>
      <component name="composerplugins" long-name="Composer Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/composerplugins/group"/>
      </component>
      <component name="harvesterplugins" long-name="Harvester Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
      </component>
      <component name="monitorplugins" long-name="Monitor Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/group"/>
      </component>
      <component name="server" long-name="Server">
-      <unit bldFile="mw/mds/harvester/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/UISettingsSrv/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/clientserver/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clockserver/server/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videocenter/vcengines/server/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="composerplugininterface" long-name="composerplugininterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/composerplugins/composerplugininterface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagecomposer" long-name="imagecomposer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/composerplugins/imagecomposer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester" long-name="harvester">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioPlaylistPlugin" long-name="AudioPlaylistPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/AudioPlaylistPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioPlugin" long-name="AudioPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/AudioPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ImagePlugin" long-name="ImagePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/ImagePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MessagePlugin" long-name="MessagePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/MessagePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OMADRMPlugin" long-name="OMADRMPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/OMADRMPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RTPPlugin" long-name="RTPPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/RTPPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VideoPlugin" long-name="VideoPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/VideoPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WMVPlugin" long-name="WMVPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/WMVPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fileplugin" long-name="fileplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/fileplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mdsfileserverplugin" long-name="mdsfileserverplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/mdsfileserverplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mdsoomplugin" long-name="mdsoomplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/mdsoomplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messageplugin" long-name="messageplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/messageplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmcplugin" long-name="mmcplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/mmcplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="monitorplugininterface" long-name="monitorplugininterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/harvester/monitorplugins/monitorplugininterface/group"/>
      </component>
     </collection>
     <collection name="locationmanager" long-name="Location Manager" level="mgr">
      <component name="client">
-      <unit bldFile="mw/mds/locationmanager/client/group"/>
      </component>
      <component name="locationtrail" long-name="Location Trail">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
      </component>
      <component name="server">
-      <unit bldFile="mw/mds/locationmanager/server/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationmanager" long-name="locationmanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/locationmanager/group"/>
      </component>
     </collection>
     <collection name="metadataengine" long-name="Metadata Engine" level="eng">
      <component name="client">
-      <unit bldFile="mw/mds/metadataengine/client/group"/>
      </component>
      <component name="common">
-      <unit bldFile="mw/mds/metadataengine/common/group"/>
      </component>
      <component name="server">
-      <unit bldFile="mw/mds/metadataengine/server/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadataengine" long-name="metadataengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/metadataengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mds" long-name="mds">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mds" long-name="mds">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mds_plat" long-name="mds_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_collection_manager_api" long-name="content_listing_framework_collection_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_extended_api" long-name="content_listing_framework_extended_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_engine_plugin_api" long-name="context_engine_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mds_plat" long-name="mds_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester_framework_api" long-name="harvester_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location_manager_api" long-name="location_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/location_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadata_engine_api" long-name="metadata_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mds_pub" long-name="mds_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_listing_framework_api" long-name="content_listing_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mds_pub" long-name="mds_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mds/mds_pub/group"/>
      </component>
     </collection>
@@ -11774,187 +12400,197 @@
    <block long-name="Multimedia UI Framework" level="specific" name="mmuifw" levels="mgr mdl util ui">
     <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
      <component name="alfwidgetutils compo" long-name="ALF Widget Utils Component">
-      <unit bldFile="mw/mmuifw/alfwidgetutils/alfwidgetutils compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alfwidgetutils" long-name="alfwidgetutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
      </component>
     </collection>
     <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
      <component name="alfcontainerwidget" long-name="ALF Container Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
      </component>
      <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
      </component>
      <component name="alfviewwidget" long-name="ALF View Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
      </component>
      <component name="common">
-      <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
      </component>
      <component name="gesturehelper" long-name="Gesture Helper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
      </component>
      <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
      </component>
      <component name="muldatamodel" long-name="Mul Data Model">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
      </component>
      <component name="mulgridwidget" long-name="Mul Grid Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/mulgridwidget/group"/>
      </component>
      <component name="mullistwidget" long-name="Mul List Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/mullistwidget/group"/>
      </component>
      <component name="mullogging" long-name="Mul Logging">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
      </component>
      <component name="mulsliderwidget" long-name="Mul Slider Widget">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mulwidgets" long-name="mulwidgets">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mulwidgets/group"/>
      </component>
     </collection>
     <collection name="osncore" long-name="OSN Core" level="util">
      <component name="osncore" long-name="OSN Core">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmuifw/osncore/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/osncore/osncore/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="mw/mmuifw/osncore/group"/>
      </component>
     </collection>
     <collection name="resourcepool" long-name="Resource Pool" level="util">
      <component name="resourcepool compo" long-name="Resource Pool Component">
-      <unit bldFile="mw/mmuifw/resourcepool/resourcepool compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="resourcepool" long-name="resourcepool">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/resourcepool/group"/>
      </component>
     </collection>
     <collection name="widgetmodel" long-name="Widget Model" level="mdl">
      <component name="alfwidgetfactory" long-name="ALF Widget Factory">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/>
      </component>
      <component name="alfwidgetmodel" long-name="ALF Widget Model">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="widgetmodel" long-name="widgetmodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/widgetmodel/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmuifw" long-name="mmuifw">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmuifw" long-name="mmuifw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmuifw_plat" long-name="mmuifw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_containerwidget_api" long-name="alf_containerwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_customlayoutmanagers_api" long-name="alf_customlayoutmanagers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_resourcepool_api" long-name="alf_resourcepool_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_scrollbarwidget_api" long-name="alf_scrollbarwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_viewwidget_api" long-name="alf_viewwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_widgetfactory_api" long-name="alf_widgetfactory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_widgetmodel_api" long-name="alf_widgetmodel_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_widgetutils_api" long-name="alf_widgetutils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gesturehelper_api" long-name="gesturehelper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmuifw_plat" long-name="mmuifw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_coverflowwidget_api" long-name="mul_coverflowwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_datamodel_api" long-name="mul_datamodel_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_gridwidget_api" long-name="mul_gridwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_gridwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_listwidget_api" long-name="mul_listwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_listwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_sliderwidget_api" long-name="mul_sliderwidget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mul_widget_api" long-name="mul_widget_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osn_container_api" long-name="osn_container_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osn_global_api" long-name="osn_global_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osn_string_api" long-name="osn_string_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
      </component>
     </collection>
@@ -11962,86 +12598,95 @@
    <block long-name="Video Utils" level="specific" name="videoutils" levels="empty eng util">
     <collection name="dvrengine" long-name="DVR Engine" level="eng">
      <component name="CommonRecordingEngine" long-name="Common Recording Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/group"/>
      </component>
      <component name="CommonRecordingEngineClient" long-name="Common Recording Engine Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngineClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DvrRtpClipHandler" long-name="DvrRtpClipHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/DvrRtpClipHandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DvrRtpClipRecognizer" long-name="DvrRtpClipRecognizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/DvrRtpClipRecognizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DvrRtpUtils" long-name="DvrRtpUtils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/DvrRtpUtils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DvrSdpParser" long-name="DvrSdpParser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/DvrSdpParser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dvrengine" long-name="dvrengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/dvrengine/group"/>
      </component>
     </collection>
     <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
      <component name="connutilpsworker" long-name="Conn Util Ps Worker">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
      </component>
      <component name="vcxconnectionutility.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="videoconnutility" long-name="videoconnutility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoconnutility/group"/>
      </component>
     </collection>
     <collection name="videoscheduler" long-name="Video Scheduler" level="util">
      <component name="SchedulerClient" long-name="Scheduler Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoscheduler/SchedulerClient/group"/>
      </component>
      <component name="SchedulerServer" long-name="Scheduler Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoscheduler/SchedulerServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoscheduler" long-name="videoscheduler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoscheduler/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoutils" long-name="videoutils">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoutils" long-name="videoutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoutils_plat" long-name="videoutils_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dvrengine_api" long-name="dvrengine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoutils_plat/dvrengine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoutils_plat" long-name="videoutils_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoutils_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoconnutility_api" long-name="videoconnutility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoscheduler_api" long-name="videoscheduler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
      </component>
     </collection>
@@ -12049,7 +12694,8 @@
    <block long-name="Multimedia Middleware" level="generic" name="mmmw" levels="plugin framework server generic specific">
     <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
      <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" class="test">
-      <unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
      </component>
      <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" class="test">
       <unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
@@ -12060,17 +12706,20 @@
     </collection>
     <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
      <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/group"/>
      </component>
      <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
      </component>
     </collection>
     <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
      <component name="mmfwplugins" long-name="Multimedia Framework Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
      </component>
     </collection>
     <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
@@ -12078,523 +12727,555 @@
       <unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
      </component>
      <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
      </component>
      <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" class="test">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
      </component>
     </collection>
     <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
      <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant">
-      <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/Group"/>
      </component>
      <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gpaudioplaycontroller" long-name="3gpaudioplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gpaudiorecordcontroller" long-name="3gpaudiorecordcontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gpDataSourceAdapter" long-name="3gpDataSourceAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpDataSourceAdapter/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aacaudioplaycontroller" long-name="aacaudioplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AdvancedAudioController" long-name="AdvancedAudioController">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioController/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AdvancedAudioControllerUtility" long-name="AdvancedAudioControllerUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/AdvancedAudioControllerUtility/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="amraudioplaycontroller" long-name="amraudioplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="amraudiorecordcontroller" long-name="amraudiorecordcontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="awbaudioplaycontroller" long-name="awbaudioplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DataSourceAdapter" long-name="DataSourceAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/DataSourceAdapter/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DevSoundAudioInput" long-name="DevSoundAudioInput">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioInput/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DevSoundAudioOutput" long-name="DevSoundAudioOutput">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/DevSoundAudioOutput/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FileAudioOutput" long-name="FileAudioOutput">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/FileAudioOutput/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HXAudioRecognizer" long-name="HXAudioRecognizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/HXAudioRecognizer/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MetaDataWrite" long-name="MetaDataWrite">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/MetaDataWrite/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mp3audioplaycontroller" long-name="mp3audioplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="advancedaudiocontroller" long-name="advancedaudiocontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/advancedaudiocontroller/group"/>
      </component>
     </collection>
     <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
      <component name="equalizer" long-name="Equalizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioeffectsui/equalizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioeffectsui" long-name="audioeffectsui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioeffectsui/group"/>
      </component>
     </collection>
     <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
      <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility">
-      <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/Group"/>
      </component>
      <component name="callaudiocontrol">
-      <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/Group"/>
      </component>
      <component name="configurationcomponentsfactory" long-name="Configuration Components Factory">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/>
      </component>
      <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client">
-      <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/Group"/>
      </component>
      <component name="enhancedmediaclient" long-name="Enhanced Media Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
      </component>
      <component name="profilesettingsmonitor" long-name="Profile Settings Monitor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/profilesettingsmonitor/group"/>
      </component>
      <component name="progressivedownload" long-name="Progressive Download">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/group"/>
      </component>
      <component name="voipaudioservices" long-name="VoIP Audio Services">
-      <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioOutputControlUtilityBase" long-name="AudioOutputControlUtilityBase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/AudioOutputControlUtilityBase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioOutputControlUtilityProxy" long-name="AudioOutputControlUtilityProxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/AudioOutputControlUtilityProxy/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioPlayer" long-name="AudioPlayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/AudioPlayer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioClientStreamSource" long-name="AudioClientStreamSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/AudioStreaming/AudioClientStreamSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioStreamingSource" long-name="AudioStreamingSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/AudioStreaming/AudioStreamingSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AudioStreaming" long-name="AudioStreaming">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/AudioStreaming/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60AudioSource" long-name="S60AudioSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/S60AudioSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60AudioSourceFactory" long-name="S60AudioSourceFactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/S60AudioSourceFactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60AudioUtility" long-name="S60AudioUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/S60AudioUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CacheSource" long-name="CacheSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/CacheSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DataBufferSource" long-name="DataBufferSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/DataBufferSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DataSourceConfigIntfc" long-name="DataSourceConfigIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/DataSourceConfigIntfc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DescriptorSource" long-name="DescriptorSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/DescriptorSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FileSource" long-name="FileSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/FileSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DataSourceFactory" long-name="DataSourceFactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/MultimediaDataSource/DataSourceFactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MultimediaDataSource" long-name="MultimediaDataSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/MultimediaDataSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProgDLSource" long-name="ProgDLSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/ProgDLSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="StreamControlCustomCommands" long-name="StreamControlCustomCommands">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/StreamControlCustomCommands/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TransferRateMonitor" long-name="TransferRateMonitor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/Plugins/TransferRateMonitor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioenhancements" long-name="audioenhancements">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProgressiveDownloadSource" long-name="ProgressiveDownloadSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/ProgressiveDownloadSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProgressiveDownloadUtility" long-name="ProgressiveDownloadUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/ProgressiveDownloadUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="JitterBufferUtility" long-name="JitterBufferUtility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/JitterBufferUtility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VoIPClient" long-name="VoIPClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/VoIPClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VoIPIntfc" long-name="VoIPIntfc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/VoIPIntfc/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VoIPServer" long-name="VoIPServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/VoIPServer/group"/>
      </component>
     </collection>
     <collection name="drmmmfapitestapp" long-name="DRM MMF API Test App" level="specific">
      <component name="DRMUtilApp.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="drmmmfapitestapp" long-name="drmmmfapitestapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/drmmmfapitestapp/group"/>
      </component>
     </collection>
     <collection name="metadatautility" long-name="Metadata Utility" level="generic">
      <component name="MetaDataUtility.dll=binary">
-      <unit bldFile="mw/mmmw/metadatautility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="metadatautility" long-name="metadatautility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/metadatautility/Group"/>
      </component>
     </collection>
     <collection name="mmfw" long-name="Multimedia Framework" level="framework">
      <component name="gstreamer" long-name="GStreamer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gstreamer_core" long-name="gstreamer_core">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gstreamer_core/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tests" long-name="tests">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gstreamer_core/tests/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gst_plugins_base" long-name="gst_plugins_base">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gst_plugins_base/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gst_plugins_good" long-name="gst_plugins_good">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gst_plugins_good/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wavparse" long-name="wavparse">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gst_plugins_good/gst/wavparse"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gst_plugins_symbian" long-name="gst_plugins_symbian">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/gstreamer/gst_plugins_symbian/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="external_packet_source_api" long-name="external_packet_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/helix_stub/external_packet_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_stub" long-name="helix_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/helix_stub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MMFMetadataEventConfigConstants" long-name="MMFMetadataEventConfigConstants">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/helix_stub/MMFMetadataEventConfigConstants/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MMFScalingCustomCommands" long-name="MMFScalingCustomCommands">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/helix_stub/MMFScalingCustomCommands/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ThumbnailAPI" long-name="ThumbnailAPI">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmfw/helix_stub/ThumbnailAPI/group"/>
      </component>
     </collection>
     <collection name="mtp" long-name="MTP" level="framework">
      <component name="install" long-name="Install">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/install/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mtp/install/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/install/group"/>
      </component>
      <component name="mtpserver" long-name="Mtp Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mtp/mtpserver/group"/>
      </component>
      <component name="mtpusbclass" long-name="MTP USB Class">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mtp/mtpusbclass/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtp" long-name="mtp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mtp/group"/>
      </component>
     </collection>
     <collection name="radioutility" long-name="Radio Utility" level="generic">
      <component name="fmpresetutility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/radioutility/fmpresetutility/group"/>
      </component>
      <component name="radio_utility" long-name="Radio Utility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/radioutility/radio_utility/group"/>
      </component>
      <component name="radioserver" long-name="Radio Server">
-      <unit bldFile="mw/mmmw/radioutility/radioserver/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/radioutility/radioserver/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radioutility" long-name="radioutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/radioutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Session" long-name="Session">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/radioutility/radioserver/Session/Group"/>
      </component>
     </collection>
     <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
      <component name="TNEEngine.dll=binary" long-name="TNE Engine">
-      <unit bldFile="mw/mmmw/thumbnailengine/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="thumbnailengine" long-name="thumbnailengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmmw/thumbnailengine/Group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmmw" long-name="mmmw">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmmw" long-name="mmmw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmmw_plat" long-name="mmmw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_metadata_reader_api" long-name="audio_metadata_reader_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_output_control_utility_api" long-name="audio_output_control_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_output_control_utility_proxy_api" long-name="audio_output_control_utility_proxy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="call_audio_control_api" long-name="call_audio_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="configuration_components_factory_api" long-name="configuration_components_factory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_audio_effects_api" long-name="emc_audio_effects_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_balance_effect_api" long-name="emc_balance_effect_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_buffer_source_api" long-name="emc_buffer_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_descriptor_source_api" long-name="emc_descriptor_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_drm_config_intfc_api" long-name="emc_drm_config_intfc_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_file_source_api" long-name="emc_file_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_progressive_download_source_api" long-name="emc_progressive_download_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emc_volume_effect_api" long-name="emc_volume_effect_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="enhanced_media_client_api" long-name="enhanced_media_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="equalizer_ui_api" long-name="equalizer_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmmw_plat" long-name="mmmw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtp_keys_api" long-name="mtp_keys_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/mtp_keys_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtp_wmdrm_api" long-name="mtp_wmdrm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/mtp_wmdrm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_data_source_api" long-name="multimedia_data_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="progressive_download_api" long-name="progressive_download_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radio_monitor_api" long-name="radio_monitor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radio_preset_utilities_api" long-name="radio_preset_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radio_utilities_api" long-name="radio_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stream_control_custom_command_api" long-name="stream_control_custom_command_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="thumbnail_engine_api" long-name="thumbnail_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voip_audio_services_api" long-name="voip_audio_services_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
      </component>
     </collection>
@@ -12602,424 +13283,429 @@
    <block long-name="Helix" level="generic" name="helix" levels="plugin framework server generic specific">
     <collection name="helix_ren" long-name="Helix" level="framework">
      <component name="helixrfsplugin" long-name="Helix RFS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/helixrfsplugin/group"/>
      </component>
      <component name="helix_binary" long-name="Helix Binary">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/helix_binary/group"/>
      </component>
      <component name="src" long-name="Src">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_ren" long-name="helix_ren">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="device" long-name="device">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/audio/device"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/webengine/device/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fixptresampler" long-name="fixptresampler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/audio/fixptresampler"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fixptutil" long-name="fixptutil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/audio/fixptutil"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="limiter" long-name="limiter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/audio/limiter"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="resampler" long-name="resampler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/audio/resampler"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiosvc" long-name="audiosvc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/audiosvc"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="container" long-name="container">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/common/container"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/container"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/common/container"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netio" long-name="netio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/common/netio"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/netio"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="system" long-name="system">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/common/system"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/system"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/transport/common/system"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="util" long-name="util">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/common/util"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/util"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/common/util"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/common/util"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netwksvc" long-name="netwksvc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/netwksvc"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videosvc" long-name="videosvc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/client/videosvc"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="symbianMmf" long-name="symbianMmf">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/clientapps/symbianMmf"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiocontroller" long-name="audiocontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/clientapps/symbianMmf/audiocontroller"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videocontroller" long-name="videocontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/clientapps/symbianMmf/videocontroller"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmvextcontroller" long-name="wmvextcontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/clientapps/symbianMmf/wmvextcontroller"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbgtool" long-name="dbgtool">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/dbgtool"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fileio" long-name="fileio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/fileio"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml" long-name="xml">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/lang/xml"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logcommon" long-name="logcommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/log/logcommon"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logobserverfile" long-name="logobserverfile">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/log/logobserverfile"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logsystem" long-name="logsystem">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/log/logsystem"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logutil" long-name="logutil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/log/logutil"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="runtime" long-name="runtime">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/common/runtime"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fileformat" long-name="fileformat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/aac/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/amr/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/avi/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp4/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/wm/fileformat"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/xps/fileformat"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="parser" long-name="parser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/aac/parser"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="payload" long-name="payload">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/aac/payload"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/amr/payload"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/h263/payload"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/payload"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp4/payload"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/audio/payload"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audrend" long-name="audrend">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/common/audrend"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="datatype" long-name="datatype">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/group/audio"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wma" long-name="wma">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/audio/arm/wma"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dsp" long-name="dsp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/audio/dsp"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flv" long-name="flv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/flv"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="h263" long-name="h263">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/h263"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="h264" long-name="h264">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/h264"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mp4" long-name="mp4">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/mp4"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rm" long-name="rm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/rm"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmv" long-name="wmv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/format/wmv"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="renderer" long-name="renderer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mdf/video/renderer"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/renderer"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp4/audio/renderer"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/null/renderer"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/audio/renderer"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/wm/audio/renderer"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="codec" long-name="codec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/codec"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fixpt" long-name="fixpt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/codec/fixpt"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="decoder" long-name="decoder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/decoder"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="id3lib" long-name="id3lib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/mp3/import/id3lib"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ra8lbr" long-name="ra8lbr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/audio/codec/ra8lbr"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sipro" long-name="sipro">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/rm/audio/codec/sipro"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadataeng" long-name="metadataeng">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/metadataeng"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utility" long-name="utility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/metadataeng/utility"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/utility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="minicntx" long-name="minicntx">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/tools/minicntx"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PacketSink" long-name="PacketSink">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/xps/PacketSink"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="test" long-name="test">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/datatype/xps/test"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/test"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="data" long-name="data">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/filesystem/data"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="http" long-name="http">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/filesystem/http"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/http"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="httplite" long-name="httplite">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/filesystem/httplite"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="local" long-name="local">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/filesystem/local"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="progdown" long-name="progdown">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/filesystem/progdown"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtsp" long-name="rtsp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/rtsp"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sdp" long-name="sdp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/sdp"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rdt" long-name="rdt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/protocol/transport/rdt"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="colconverter" long-name="colconverter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/video/colconverter"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="site" long-name="site">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/video/site"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sitelib" long-name="sitelib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/video/sitelib"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vidutil" long-name="vidutil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_ren/src/video/vidutil"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="helix_plat" long-name="helix_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="external_packet_source_api" long-name="external_packet_source_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/external_packet_source_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_plat" long-name="helix_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_features" long-name="helix_features">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/helix_features/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_meta_data_utility" long-name="helix_meta_data_utility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/helix_meta_data_utility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadata_update_event_api" long-name="metadata_update_event_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/metadata_update_event_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scaling_custom_ommand_api" long-name="scaling_custom_ommand_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_plat/scaling_custom_ommand_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="helix_pub" long-name="helix_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix_pub" long-name="helix_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rop_custom_commands_api" long-name="rop_custom_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/helix/helix_pub/rop_custom_commands_api/group"/>
      </component>
     </collection>
@@ -13027,96 +13713,105 @@
    <block long-name="Camera Services" level="specific" name="camerasrv" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
      <component name="Engine">
-      <unit bldFile="mw/camerasrv/camappengine/Engine/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/camerasrv/camappengine/Engine/Group"/>
      </component>
      <component name="StillConverter" long-name="Still Converter">
-      <unit bldFile="mw/camerasrv/camappengine/StillConverter/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/camerasrv/camappengine/StillConverter/Group"/>
      </component>
      <component name="asynchfilesavequeue" long-name="Asynch File Save Queue">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Build" long-name="Build">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camappengine/Build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camcordermmfplugin/Build"/>
      </component>
     </collection>
     <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
      <component name="controller" long-name="Controller">
-      <unit bldFile="mw/camerasrv/camcordermmfplugin/controller/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/organizer/calendarui/controller/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/camerasrv/camcordermmfplugin/controller/Group"/>
      </component>
      <component name="filecomposer" long-name="File Composer">
-      <unit bldFile="mw/camerasrv/camcordermmfplugin/filecomposer/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/camerasrv/camcordermmfplugin/filecomposer/Group"/>
      </component>
      <component name="mediarecorder" long-name="Media Recorder">
-      <unit bldFile="mw/camerasrv/camcordermmfplugin/mediarecorder/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/camerasrv/camcordermmfplugin/mediarecorder/Group"/>
      </component>
     </collection>
     <collection name="configmanagers" long-name="Config Managers" level="api">
      <component name="imagingconfigmanager" long-name="Imaging Config Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="configmanagers" long-name="configmanagers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/configmanagers/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="camerasrv" long-name="camerasrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camerasrv" long-name="camerasrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="camerasrv_plat" long-name="camerasrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3gp_file_composer_api" long-name="3gp_file_composer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asynchronous_file_saving_queue_api" long-name="asynchronous_file_saving_queue_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cae_extentension_api" long-name="cae_extentension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camera_application_engine_api" long-name="camera_application_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_onboard_camera_api" long-name="custom_onboard_camera_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camerasrv_plat" long-name="camerasrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imaging_configuration_manager_api" long-name="imaging_configuration_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_recorder_api" long-name="media_recorder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_recorder_sink_api" long-name="media_recorder_sink_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
      </component>
     </collection>
@@ -13124,220 +13819,228 @@
    <block long-name="Multimedia App Framework" level="specific" name="mmappfw" levels="empty fw utils">
     <collection name="mmappcomponents" long-name="MM App Components" level="utils">
      <component name="asxparser" long-name="ASX Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
      </component>
      <component name="collectionhelper" long-name="Collection Helper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
      </component>
      <component name="harvester" long-name="Harvester">
-      <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
      </component>
      <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
      </component>
      <component name="mmappcommonui" long-name="MM App Common UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
      </component>
      <component name="playlistengine" long-name="Playlist Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmappcomponents" long-name="mmappcomponents">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionmediator" long-name="collectionmediator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/collectionmediator/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filehandler" long-name="filehandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/filehandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadataextractor" long-name="metadataextractor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/metadataextractor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="albumartutility" long-name="albumartutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/albumartutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="backsteppingutility" long-name="backsteppingutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/backsteppingutility/group"/>
      </component>
     </collection>
     <collection name="mpx" long-name="MPX" level="fw">
      <component name="collectionframework" long-name="Collection Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/photos/photosgallery/collectionframework/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="app/photos/photosgallery/collectionframework/group"/>
      </component>
      <component name="commonframework" long-name="Common Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
      </component>
      <component name="playbackframework" long-name="Playback Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
      </component>
      <component name="viewframework" long-name="View Framework">
-      <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionengine" long-name="collectionengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/collectionframework/collectionengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionserver" long-name="collectionserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/collectionframework/collectionserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionutility" long-name="collectionutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/collectionframework/collectionutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx" long-name="mpx">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playbackengine" long-name="playbackengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/playbackframework/playbackengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playbackserver" long-name="playbackserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/playbackframework/playbackserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playbackutility" long-name="playbackutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/playbackframework/playbackutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="baseviewplugins" long-name="baseviewplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/viewframework/baseviewplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="viewutility" long-name="viewutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mpx/viewframework/viewutility/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmappfw" long-name="mmappfw">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmappfw" long-name="mmappfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmappfw_plat" long-name="mmappfw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asx_parser_api" long-name="asx_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collection_helper_api" long-name="collection_helper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmappfw_plat" long-name="mmappfw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester_collection_mediator_api" long-name="harvester_collection_mediator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester_metadata_extractor_api" long-name="harvester_metadata_extractor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester_server_api" long-name="harvester_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="harvester_utility_api" long-name="harvester_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_player_settings_engine_api" long-name="media_player_settings_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_albumart_utility_api" long-name="mpx_albumart_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_backstepping_utility_api" long-name="mpx_backstepping_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_base_view_plugins_api" long-name="mpx_base_view_plugins_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_collection_common_definition_api" long-name="mpx_collection_common_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_collection_utility_api" long-name="mpx_collection_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_common_api" long-name="mpx_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_common_definition_api" long-name="mpx_common_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_playback_common_definition_api" long-name="mpx_playback_common_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_playback_utility_api" long-name="mpx_playback_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_view_utility_api" long-name="mpx_view_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playlist_engine_api" long-name="playlist_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
      </component>
     </collection>
@@ -13345,241 +14048,255 @@
    <block long-name="Input Methods" level="generic" name="inputmethods" levels="plugin engine framework">
     <collection name="fep" long-name="FEP" level="engine">
      <component name="frontendprocessor" long-name="Front End Processor">
-      <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
      </component>
      <component name="aknfep" long-name="AKN FEP">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peninputimeplugincn" long-name="peninputimeplugincn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peninputimeplugingeneric" long-name="peninputimeplugingeneric">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peninputimepluginitut" long-name="peninputimepluginitut">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peninputimepluginjp" long-name="peninputimepluginjp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AvkonImpl" long-name="AvkonImpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/UiPlugins/AknFepUiInterface/AvkonImpl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknFepUiInterface" long-name="AknFepUiInterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/aknfep/UiPlugins/AknFepUiInterface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fep" long-name="fep">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/fep/group"/>
      </component>
     </collection>
     <collection name="textinput" long-name="Text Input" level="framework">
      <component name="AknInputLanguage" long-name="Akn Input Language">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/AknInputLanguage/group"/>
      </component>
      <component name="GSLangPlugin.dll=binary" long-name="GS Lang Plugin">
-      <unit bldFile="mw/inputmethods/textinput/group"/>
      </component>
      <component name="Matsutake" long-name="Matsutake">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/Matsutake/group"/>
      </component>
      <component name="PtiAtokCore" long-name="PTI Atok Core">
-      <unit bldFile="mw/inputmethods/textinput/PtiAtokCore/group"/>
      </component>
      <component name="PtiDecumaJpCore" long-name="PTI Decuma JpCore">
-      <unit bldFile="mw/inputmethods/textinput/PtiDecumaJpCore/group"/>
      </component>
      <component name="PtiEngine" long-name="PTI Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/PtiEngine/group"/>
      </component>
      <component name="PtiT9Core" long-name="PTI T9 Core">
-      <unit bldFile="mw/inputmethods/textinput/PtiT9Core/group"/>
      </component>
      <component name="ocrsrv" long-name="OCR Srv">
-      <unit bldFile="mw/inputmethods/textinput/ocrsrv/group"/>
      </component>
      <component name="peninputarc" long-name="Pen Input Arc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
      </component>
      <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
      </component>
      <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
      </component>
      <component name="peninputcommonlayout" long-name="Pen Input Common Layout">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
      </component>
      <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
      </component>
      <component name="peninputgenericitut" long-name="Pen Input Generici Tut">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
      </component>
      <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
      </component>
      <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
      </component>
      <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
      </component>
      <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
      </component>
      <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
      </component>
      <component name="peninputvkbcn" long-name="Pen Input Vkbcn">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
      </component>
      <component name="peninputvkbjp" long-name="Pen Input Vkbjp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
      </component>
      <component name="pticpicore" long-name="PTI CPI Core">
-      <unit bldFile="mw/inputmethods/textinput/pticpicore/group"/>
      </component>
      <component name="ptidecumacore" long-name="Pti Decuma Core">
-      <unit bldFile="mw/inputmethods/textinput/ptidecumacore/group"/>
      </component>
      <component name="ptienginev2" long-name="PTI Engine V2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
      </component>
      <component name="ptiindicphoneticcore" long-name="PTI Indic Phone Tic Core">
-      <unit bldFile="mw/inputmethods/textinput/ptiindicphoneticcore/group"/>
      </component>
      <component name="ptivocore" long-name="PTI VO Core">
-      <unit bldFile="mw/inputmethods/textinput/ptivocore/group"/>
      </component>
      <component name="ptixt9core" long-name="PTI XT9 Core">
-      <unit bldFile="mw/inputmethods/textinput/ptixt9core/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="textinput" long-name="textinput">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/inputmethods/textinput/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSLangPlugin" long-name="GSLangPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/GSLangPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peninputserverapp" long-name="peninputserverapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utils" long-name="utils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="languages" long-name="languages">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/textinput/ptienginev2/languages"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="inputmethods" long-name="inputmethods">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="inputmethods" long-name="inputmethods">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="inputmethods_plat" long-name="inputmethods_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknfep_definitions_api" long-name="aknfep_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknfep_pen_support_api" long-name="aknfep_pen_support_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknfep_settings_api" long-name="aknfep_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknfep_status_api" long-name="aknfep_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknfep_uiinterface_api" long-name="aknfep_uiinterface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="inputmethods_plat" long-name="inputmethods_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pen_input_server_api" long-name="pen_input_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_core_api" long-name="ptiengine_core_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_core_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_hwr_api" long-name="ptiengine_hwr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_indic_definitions_api" long-name="ptiengine_indic_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_key_definations_api" long-name="ptiengine_key_definations_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="inputmethods_pub" long-name="inputmethods_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="inputmethods_pub" long-name="inputmethods_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="input_language_info_api" long-name="input_language_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="optical_character_recognition_api" long-name="optical_character_recognition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_api" long-name="ptiengine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ptiengine_iti_api" long-name="ptiengine_iti_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
      </component>
     </collection>
@@ -13587,902 +14304,925 @@
    <block long-name="Classic UI" level="generic" name="classicui" levels="base support server generic specific">
     <collection name="commonuisupport" long-name="Common UI Support" level="support">
      <component name="errorresolverdata" long-name="Error Resolver Data">
-      <unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
      </component>
      <component name="grid" long-name="Grid">
-      <unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
      </component>
      <component name="uifwsdocs" long-name="UI Frameworks Documentation" class="doc">
       <unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
      </component>
      <component name="uilaf" long-name="UI Look and Feel" introduced="6.0">
-      <unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
      </component>
      <component name="uikon" long-name="Uikon" introduced="6.0">
-      <unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
      </component>
     </collection>
     <collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
      <component name="animation" long-name="Animation" introduced="9.1">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
      </component>
      <component name="bmpanimation" long-name="BMP Animation" introduced="6.0">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
      </component>
      <component name="clockanim" long-name="Clock" plugin="Y">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
      </component>
      <component name="cone" long-name="Control Environment">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
      </component>
      <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
      </component>
      <component name="uigraphicsutils" long-name="UI Graphics Utilities">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
      </component>
     </collection>
     <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
      <component name="ServiceHandler" long-name="Service Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/applicationinterworkingfw/ServiceHandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="applicationinterworkingfw" long-name="applicationinterworkingfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/applicationinterworkingfw/group"/>
      </component>
     </collection>
     <collection name="commonuis" long-name="Common UIs" level="specific">
      <component name="CommonDialogs" long-name="Common Dialogs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/commonuis/CommonDialogs/group"/>
      </component>
      <component name="CommonUi" long-name="Common UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/commonuis/CommonUi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="group_test" long-name="group_test">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/commonuis/CommonDialogs/group_test"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonuis" long-name="commonuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/commonuis/group"/>
      </component>
     </collection>
     <collection name="psln" long-name="Personalization" level="specific">
      <component name="PslnFramework" long-name="Personalization Framework">
-      <unit bldFile="mw/classicui/psln/PslnFramework/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/psln/PslnFramework"/>
      </component>
      <component name="PslnFramework.dll=binary">
-      <unit bldFile="mw/classicui/psln/group"/>
      </component>
      <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/psln/PslnGSPlugin/group"/>
      </component>
      <component name="PslnLibraryLoaders" long-name="Personalization Library Loaders">
-      <unit bldFile="mw/classicui/psln/PslnLibraryLoaders/group"/>
      </component>
      <component name="psln.exe=binary" long-name="Psln">
-<!--       <unit bldFile="mw/classicui/psln/group"/> -->
      </component>
      <component name="pslnengine" long-name="Personalization Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/psln/pslnengine/group"/>
      </component>
      <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="psln" long-name="psln">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/classicui/psln/Group"/>
+     </component>
     </collection>
     <collection name="uifw" long-name="UI Framework" level="server">
      <component name="AknGlobalUI" long-name="Avkon Global UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AknGlobalUI/group"/>
      </component>
      <component name="AvKon" long-name="AvKon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/group"/>
      </component>
      <component name="EikStd" long-name="EikStd">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/EikStd/group"/>
      </component>
      <component name="eikctl" long-name="Eikctl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/eikctl/group"/>
      </component>
      <component name="tactilefeedback" long-name="Tactile Feedback">
-      <unit bldFile="mw/classicui/uifw/tactilefeedback/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
      </component>
      <component name="uiklaf" long-name="UIKLAF">
-      <unit bldFile="mw/classicui/uifw/uiklaf/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/classicui/uifw/uiklaf/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="akncompamode" long-name="akncompamode">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/akncompamode/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gs" long-name="gs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/akncompamode/gs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srv" long-name="srv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/akncompamode/srv/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknExtendedFader" long-name="AknExtendedFader">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/AknExtendedFader/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknhlist" long-name="aknhlist">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/aknhlist/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknKeyRotator" long-name="AknKeyRotator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/AknKeyRotator/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknListLoaderTfx" long-name="AknListLoaderTfx">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/AknListLoaderTfx/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknTransitionUtils" long-name="AknTransitionUtils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/AknTransitionUtils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PreBuilder" long-name="PreBuilder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/AvKon/PreBuilder"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uifw" long-name="uifw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/uifw/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="classicui" long-name="classicui">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="classicui" long-name="classicui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="classicui_plat" long-name="classicui_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_provider_utility_api" long-name="aiw_provider_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_service_interface_base_api" long-name="aiw_service_interface_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_service_interface_menu_api" long-name="aiw_service_interface_menu_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarm_api" long-name="alarm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/alarm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="application_switching_api" long-name="application_switching_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_anim_dll_api" long-name="avkon_anim_dll_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_fonts_api" long-name="avkon_fonts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_localised_texts_api" long-name="avkon_localised_texts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_secondary_display_api" long-name="avkon_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_secondary_display_support_api" long-name="avkon_secondary_display_support_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_settings_api" long-name="avkon_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_status_api" long-name="avkon_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="avkon_ui_server_api" long-name="avkon_ui_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="battery_pane_api" long-name="battery_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_file_dialogs_filter_factory_api" long-name="common_file_dialogs_filter_factory_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_ui_settings_api" long-name="common_ui_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="custom_cursors_api" long-name="custom_cursors_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eikon_server_extension_client_api" long-name="eikon_server_extension_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emergency_call_support_api" long-name="emergency_call_support_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_aiw_criteria_api" long-name="extended_aiw_criteria_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_animation_api" long-name="extended_animation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_buttons_api" long-name="extended_buttons_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_dialogs_api" long-name="extended_dialogs_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_editors_api" long-name="extended_editors_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_grids_api" long-name="extended_grids_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_indicators_api" long-name="extended_indicators_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_initialization_api" long-name="extended_initialization_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_input_capabilities_api" long-name="extended_input_capabilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_lists_api" long-name="extended_lists_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_notes_api" long-name="extended_notes_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_notifiers_api" long-name="extended_notifiers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_queries_api" long-name="extended_queries_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_scroller_api" long-name="extended_scroller_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_setting_pages_api" long-name="extended_setting_pages_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_sounds_api" long-name="extended_sounds_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_status_pane_api" long-name="extended_status_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_ui_framework_definitions_api" long-name="extended_ui_framework_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_utilities_api" long-name="extended_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fep_document_navigation_api" long-name="fep_document_navigation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="find_item_ui_api" long-name="find_item_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="generic_parameter_api" long-name="generic_parameter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="global_popup_priority_controller_api" long-name="global_popup_priority_controller_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="global_window_priorities_api" long-name="global_window_priorities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="classicui_plat" long-name="classicui_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="indicator_plugin_api" long-name="indicator_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="indicator_touch_observer_api" long-name="indicator_touch_observer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="input_block_api" long-name="input_block_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/input_block_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="item_finder_api" long-name="item_finder_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="japanese_reading_api" long-name="japanese_reading_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="key_event_utilities_api" long-name="key_event_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="key_rotator_api" long-name="key_rotator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="layout_configuration_api" long-name="layout_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="legacy_ui_framework_headers_api" long-name="legacy_ui_framework_headers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="list_effects_api" long-name="list_effects_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="long_tap_animation_api" long-name="long_tap_animation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_shared_document_api" long-name="media_shared_document_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memory_card_ui_api" long-name="memory_card_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="number_grouping_api" long-name="number_grouping_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_application_api" long-name="personalisation_application_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_framework_api" long-name="personalisation_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_localised_texts_api" long-name="personalisation_localised_texts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_plugin_api" long-name="personalisation_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_slide_show_dialog_api" long-name="personalisation_slide_show_dialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_number_text_utilities_api" long-name="phone_number_text_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pointer_event_modifier_api" long-name="pointer_event_modifier_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="popup_form_api" long-name="popup_form_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screensaver_animation_plugin_definitions_api" long-name="screensaver_animation_plugin_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screensaver_runtime_api" long-name="screensaver_runtime_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screensaver_settings_api" long-name="screensaver_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="server_application_services_api" long-name="server_application_services_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="signal_pane_api" long-name="signal_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="skinnable_clock_api" long-name="skinnable_clock_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="special_character_table_api" long-name="special_character_table_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stylus_activated_popup_api" long-name="stylus_activated_popup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="task_list_api" long-name="task_list_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/task_list_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="text_scroller_api" long-name="text_scroller_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="themes_settings_api" long-name="themes_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="transition_effect_parameters_api" long-name="transition_effect_parameters_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="transition_effect_utilities_api" long-name="transition_effect_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uikon_status_api" long-name="uikon_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="volume_popup_api" long-name="volume_popup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="classicui_pub" long-name="classicui_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_criteria_api" long-name="aiw_criteria_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_generic_parameter_api" long-name="aiw_generic_parameter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_service_handler_api" long-name="aiw_service_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="animation_api" long-name="animation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/animation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="application_framework_api" long-name="application_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="base_controls_api" long-name="base_controls_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/base_controls_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="buttons_api" long-name="buttons_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/buttons_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_api" long-name="calendar_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="choice_list_api" long-name="choice_list_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_file_dialogs_api" long-name="common_file_dialogs_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="context_pane_api" long-name="context_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/context_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dialogs_api" long-name="dialogs_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dialog_shutter_api" long-name="dialog_shutter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="document_handler_api" long-name="document_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="editors_api" long-name="editors_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/editors_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="error_ui_api" long-name="error_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fonts_api" long-name="fonts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/fonts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="form_api" long-name="form_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/form_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="generic_button_api" long-name="generic_button_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="grids_api" long-name="grids_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/grids_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="classicui_pub" long-name="classicui_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hierarchical_lists_api" long-name="hierarchical_lists_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hotkeys_api" long-name="hotkeys_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="images_api" long-name="images_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/images_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="indicators_api" long-name="indicators_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/indicators_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="information_preview_popup_api" long-name="information_preview_popup_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="info_popup_note_api" long-name="info_popup_note_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="initialization_api" long-name="initialization_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/initialization_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="input_frame_api" long-name="input_frame_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/input_frame_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="intermediate_state_api" long-name="intermediate_state_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="keylock_api" long-name="keylock_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/keylock_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="labels_api" long-name="labels_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/labels_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lists_api" long-name="lists_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/lists_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="misc_controls_api" long-name="misc_controls_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="navigation_pane_api" long-name="navigation_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notes_api" long-name="notes_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/notes_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notifiers_api" long-name="notifiers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/notifiers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="options_menu_api" long-name="options_menu_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="popups_api" long-name="popups_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/popups_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="private_ui_framework_api" long-name="private_ui_framework_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="queries_api" long-name="queries_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/queries_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screen_clearer_api" long-name="screen_clearer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screen_mode_api" long-name="screen_mode_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screen_saver_api" long-name="screen_saver_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scroller_api" long-name="scroller_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/scroller_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchfield_api" long-name="searchfield_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="server_application_api" long-name="server_application_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="setting_pages_api" long-name="setting_pages_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="slider_api" long-name="slider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/slider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sounds_api" long-name="sounds_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/sounds_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="status_pane_api" long-name="status_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/status_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stylus_popup_menu_api" long-name="stylus_popup_menu_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tabs_api" long-name="tabs_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/tabs_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="title_pane_api" long-name="title_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/title_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="title_pane_touch_observer_api" long-name="title_pane_touch_observer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="toolbar_api" long-name="toolbar_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="touch_pane_api" long-name="touch_pane_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/touch_pane_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="touch_pane_observer_api" long-name="touch_pane_observer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/touch_pane_observer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="touch_ui_utilities_api" long-name="touch_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uikon_core_controls" long-name="uikon_core_controls">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui_framework_definitions_api" long-name="ui_framework_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui_framework_utilities_api" long-name="ui_framework_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="volume_control_api" long-name="volume_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/volume_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="window_server_event_observer_api" long-name="window_server_event_observer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group"/>
      </component>
     </collection>
@@ -14490,48 +15230,47 @@
    <block long-name="SVG Tiny" level="generic" name="svgt" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
      <component name="SVG">
-      <unit bldFile="mw/svgt/svgtopt/SVG/group"/>
      </component>
      <component name="SVGEngineJI" long-name="SVG Engine JI">
-      <unit bldFile="mw/svgt/svgtopt/SVGEngineJI/group"/>
      </component>
      <component name="SVGTPlugin" long-name="SVGT Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgtopt/SVGTPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgtopt" long-name="svgtopt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgtopt/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SVGRecog" long-name="SVGRecog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgtopt/SVG/SVGRecog/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="svgt" long-name="svgt">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt" long-name="svgt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="svgt_plat" long-name="svgt_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt_plat" long-name="svgt_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgt_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nvg_api" long-name="nvg_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt_api" long-name="svgt_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
      </component>
     </collection>
@@ -14539,98 +15278,102 @@
    <block long-name="UI Accelerator" level="generic" name="uiaccelerator" levels="plugin framework server generic specific">
     <collection name="uiaccelexampleapps" long-name="UI Accelerator Example Apps" level="specific">
      <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/>
      </component>
      <component name="alfexstickers" long-name="ALF Ex Stickers">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/>
      </component>
     </collection>
     <collection name="uiacceltk" long-name="UI Accelerator TK" level="framework">
      <component name="hitchcock" long-name="Hitchcock">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
      </component>
      <component name="widgeteditors" long-name="Widget Editors">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/widgeteditors/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiacceltk" long-name="uiacceltk">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="coretoolkit" long-name="coretoolkit">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/coretoolkit/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alftranseffectplugin" long-name="alftranseffectplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Tracer" long-name="Tracer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/Tracer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TraceExtClient" long-name="TraceExtClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/Tracer/TraceExtClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TraceExtPlugin" long-name="TraceExtPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/Tracer/TraceExtPlugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uiaccelerator" long-name="uiaccelerator">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiaccelerator" long-name="uiaccelerator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uiaccelerator_plat" long-name="uiaccelerator_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_client_server_api" long-name="alf_client_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_core_toolkit_api" long-name="alf_core_toolkit_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_editors_api" long-name="alf_editors_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_extended_visual_api" long-name="alf_extended_visual_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_extension_api" long-name="alf_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_tracing_api" long-name="alf_tracing_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alf_visual_api" long-name="alf_visual_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiaccelerator_plat" long-name="uiaccelerator_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
      </component>
     </collection>
@@ -14638,372 +15381,378 @@
    <block long-name="UI Resources" level="generic" name="uiresources" levels="compile plugin framework server generic specific">
     <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
      <component name="aknlayoutcompiler compo" long-name="AKN Layout Compiler Component">
-      <unit bldFile="mw/uiresources/aknlayoutcompiler/aknlayoutcompiler compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aknlayoutcompiler" long-name="aknlayoutcompiler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
      </component>
     </collection>
     <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
      <component name="cdlcompiler compo" long-name="CDL Compiler Component">
-      <unit bldFile="mw/uiresources/cdlcompiler/cdlcompiler compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cdlcompiler" long-name="cdlcompiler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/cdlcompiler/group"/>
      </component>
     </collection>
     <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
      <component name="cdlcompilertoolkit compo" long-name="CDL Compiler Toolkit Component">
-      <unit bldFile="mw/uiresources/cdlcompilertoolkit/cdlcompilertoolkit compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cdlcompilertoolkit" long-name="cdlcompilertoolkit">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
      </component>
     </collection>
     <collection name="fontsupport" long-name="Font Support" level="generic">
      <component name="fontprovider" long-name="Font Provider">
-      <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/uiresources/fontsupport/fontprovider/Group"/>
      </component>
      <component name="fontutils" long-name="Font Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/fontsupport/fontutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fontsupport" long-name="fontsupport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/fontsupport/group"/>
      </component>
     </collection>
     <collection name="layouts" long-name="Layouts" level="plugin">
      <component name="aknlayout2" long-name="AKN Layout 2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
      </component>
      <component name="cdl" long-name="Cdl">
-      <unit bldFile="mw/uiresources/layouts/cdl/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="generated" long-name="generated">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Nhd_akn_app" long-name="Nhd_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Nhd_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Nhd_uiaccel" long-name="Nhd_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Nhd_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qhd_touch_akn_app" long-name="Qhd_touch_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qhd_touch_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qhd_touch_uiaccel" long-name="Qhd_touch_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qhd_touch_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qvga2_akn_app" long-name="Qvga2_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qvga2_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qvga2_uiaccel" long-name="Qvga2_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qvga2_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qvga_akn_app" long-name="Qvga_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qvga_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Qvga_uiaccel" long-name="Qvga_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Qvga_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Vga3_akn_app" long-name="Vga3_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Vga3_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Vga3_uiaccel" long-name="Vga3_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Vga3_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Vga_akn_app" long-name="Vga_akn_app">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Vga_akn_app"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Vga_uiaccel" long-name="Vga_uiaccel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/Vga_uiaccel"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CdlEngine" long-name="CdlEngine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/cdl/CdlEngine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CdlServer" long-name="CdlServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/cdl/CdlServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CdlExplorer" long-name="CdlExplorer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/layouts/cdl/CdlUtils/CdlExplorer/group"/>
      </component>
     </collection>
     <collection name="locales" long-name="Locales" level="framework">
      <component name="locales compo" long-name="Locales Component">
-      <unit bldFile="mw/uiresources/locales/locales compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locales" long-name="locales">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/locales/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="loce32" long-name="loce32">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/locales/loce32"/>
      </component>
     </collection>
     <collection name="pictographs" long-name="Pictographs" level="specific">
      <component name="AknPictograph" long-name="AKN Picto Graph">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/pictographs/AknPictograph/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pregenerated" long-name="pregenerated">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/pictographs/AknPictograph/pregenerated"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AknPictoBitmapBuilder" long-name="AknPictoBitmapBuilder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/pictographs/AknPictograph/tools/AknPictoBitmapBuilder/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pictographs" long-name="pictographs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/pictographs/group"/>
      </component>
     </collection>
     <collection name="skincompiler" long-name="Skin Compiler" level="compile">
      <component name="AknSkinDescCompiler" long-name="AKN Skin Desc Compiler">
-      <unit bldFile="mw/uiresources/skincompiler/AknSkinDescCompiler/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="skincompiler" long-name="skincompiler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/skincompiler/group"/>
      </component>
     </collection>
     <collection name="skins" long-name="Skins" level="specific">
      <component name="AknSkinContent" long-name="AKN Skin Content">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/skins/AknSkinContent/group"/>
      </component>
      <component name="AknSkins" long-name="AKN Skins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/skins/AknSkins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MifIndexDll" long-name="MifIndexDll">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/skins/AknSkinContent/srcdata/scalableseries60skin/MifIndexDll"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="skins" long-name="skins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/skins/group"/>
      </component>
     </collection>
     <collection name="uiconfig" long-name="UI Config" level="server">
      <component name="s60config" long-name="S60 Config">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiconfig" long-name="uiconfig">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiconfig/group"/>
      </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
      <component name="AknIcon" long-name="AKN Icon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/AknIcon/group"/>
      </component>
      <component name="Bitmaps2" long-name="Bitmaps 2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/Bitmaps2/group"/>
      </component>
      <component name="Icons">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/Icons/group"/>
      </component>
      <component name="VariatedBitmaps" long-name="Variated Bitmaps">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/VariatedBitmaps/group"/>
      </component>
      <component name="palette" long-name="Palette">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/palette/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uigraphics" long-name="uigraphics">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OemNokia" long-name="OemNokia">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uigraphics/Icons/data/OemNokia/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uiresources" long-name="uiresources">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiresources" long-name="uiresources">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uiresources_plat" long-name="uiresources_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cdl_api" long-name="cdl_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_fonts_api" long-name="extended_fonts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extended_skins_api" long-name="extended_skins_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphic_configuration_api" long-name="graphic_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiresources_plat" long-name="uiresources_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="language_code_definitions_api" long-name="language_code_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="layout_data_api" long-name="layout_data_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="layout_system_private_api" long-name="layout_system_private_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mifconv_definitions_api" long-name="mifconv_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mif_header_cdl_api" long-name="mif_header_cdl_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="personalisation_and_skins_settings_api" long-name="personalisation_and_skins_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="private_user_area_code_definitions_api" long-name="private_user_area_code_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="skins_image_attributes_api" long-name="skins_image_attributes_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tfx_effect_setup_plugin_api" long-name="tfx_effect_setup_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tfx_server_controller_plugin_api" long-name="tfx_server_controller_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tfx_server_plugin_ids_api" long-name="tfx_server_plugin_ids_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wallpaper_configuration_api" long-name="wallpaper_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uiresources_pub" long-name="uiresources_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="font_definition_api" long-name="font_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics_api" long-name="graphics_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiresources_pub" long-name="uiresources_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="layout_id_definitions_api" long-name="layout_id_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pictograph_api" long-name="pictograph_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scalable_icons_api" long-name="scalable_icons_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="skins_api" long-name="skins_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group"/>
      </component>
     </collection>
@@ -15011,304 +15760,322 @@
    <block long-name="Home Screen Services" level="specific" name="homescreensrv" levels="plugin framework server generic specific">
     <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
      <component name="bsengine.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="backsteppingsrv" long-name="backsteppingsrv">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
      </component>
     </collection>
     <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
      <component name="contentharvester" long-name="Content Harvester">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
      </component>
      <component name="contentpublishingserver" long-name="Content Publishing Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
      </component>
      <component name="contentpublishingutils" long-name="Content Publishing Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentharvesterclient" long-name="contentharvesterclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/contentharvesterclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentharvesterserver" long-name="contentharvesterserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/contentharvesterserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="factorysettingsplugin" long-name="factorysettingsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/factorysettingsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cpserver" long-name="cpserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/cpserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cpsqlitestorage" long-name="cpsqlitestorage">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/cpsqlitestorage/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentpublishingdebug" long-name="contentpublishingdebug">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentpublishingmap" long-name="contentpublishingmap">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingmap/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pluginvalidator" long-name="pluginvalidator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/pluginvalidator/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentpublishingsrv" long-name="contentpublishingsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
      </component>
     </collection>
     <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
      <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/hspsdefinitionengine/group"/>
      </component>
      <component name="hspsdom" long-name="Homescreen Plugin Server DOM">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/>
      </component>
      <component name="hspsmanager" long-name="Homescreen Plugin Server Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/>
      </component>
      <component name="hspsodt" long-name="Homescreen Plugin Server ODT">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/>
      </component>
      <component name="hspspluginregistry" long-name="Homescreen Plugin Registry">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/>
      </component>
      <component name="hspsresource" long-name="Homescreen Plugin Server Resource">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/>
      </component>
      <component name="hspsresult" long-name="Homescreen Plugin Server Result">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/>
      </component>
      <component name="hspstools" long-name="Homescreen Plugin Server Tools">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspstools/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreenpluginsrv" long-name="homescreenpluginsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hspsdefinitionengineinterface" long-name="hspsdefinitionengineinterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/hspsdefinitionengineinterface/group"/>
      </component>
     </collection>
     <collection name="idlefw" long-name="Idle Framework" level="framework">
      <component name="aifw.dll=binary">
-      <unit bldFile="mw/homescreensrv/idlefw/group"/>
      </component>
      <component name="aiidleint.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/idlefw/group"/> -->
      </component>
      <component name="ailaunch.exe=binary">
-<!--       <unit bldFile="mw/homescreensrv/idlefw/group"/> -->
      </component>
      <component name="aiutils.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/idlefw/group"/> -->
      </component>
      <component name="plugins">
-      <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="idlefw" long-name="idlefw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/homescreensrv/idlefw/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profileplugin" long-name="profileplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/idlefw/plugins/profileplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pslnactiveidleplugin" long-name="pslnactiveidleplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapidataplugin" long-name="sapidataplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/idlefw/plugins/sapidataplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortcutplugin" long-name="shortcutplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/idlefw/plugins/shortcutplugin/group"/>
      </component>
     </collection>
     <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
      <component name="mcsextendedmenu.dll=binary">
-      <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
      </component>
      <component name="mcsmenu.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="mcsmenueng.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="mcsmenuhandler.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="mcsmenuserver.exe=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="mcsmenuutils.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="mcssathandler.dll=binary">
-<!--       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/> -->
      </component>
      <component name="menusatinterface" long-name="Menu SAT Interface">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="menucontentsrv" long-name="menucontentsrv">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
+     </component>
     </collection>
     <collection name="xcfw" long-name="XCFW" level="framework">
      <component name="XCFW.dll=binary" long-name="XCFW">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="xcfw" long-name="xcfw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/xcfw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="homescreensrv" long-name="homescreensrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreensrv" long-name="homescreensrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="homescreensrv_plat" long-name="homescreensrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="action_handler_plugin_api" long-name="action_handler_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_content_model_api" long-name="ai_content_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_plugin_information_api" long-name="ai_plugin_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_plugin_management_api" long-name="ai_plugin_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_shortcut_command_api" long-name="ai_shortcut_command_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_shortcut_command_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_utilities_api" long-name="ai_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai_variation_api" long-name="ai_variation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="content_harvester_plugin_api" long-name="content_harvester_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="external_home_screen_api" long-name="external_home_screen_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreensrv_plat" long-name="homescreensrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="idlefw_api" long-name="idlefw_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="menu_content_service_api" long-name="menu_content_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="menu_model_api" long-name="menu_model_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="menu_sat_interface_api" long-name="menu_sat_interface_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="actionhandlerplugins" long-name="actionhandlerplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="actionhandlerservice" long-name="actionhandlerservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapi_actionhandler" long-name="sapi_actionhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapi_backstepping" long-name="sapi_backstepping">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapi_contentpublishing" long-name="sapi_contentpublishing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapi_homescreenplugin" long-name="sapi_homescreenplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hspsservice" long-name="hspsservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/hspsservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sapi_menucontent" long-name="sapi_menucontent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mcsservice" long-name="mcsservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/mcsservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortcutplugin_extension_api" long-name="shortcutplugin_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/shortcutplugin_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xcfw_api" long-name="xcfw_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
      </component>
     </collection>
@@ -15316,197 +16083,210 @@
    <block long-name="Application Installation" level="generic" name="appinstall" levels="framework generic specific api">
     <collection name="installationservices" long-name="Installation Services" level="generic">
      <component name="swi" long-name="Secure Software Install">
-      <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
      </component>
      <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1">
-      <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
      </component>
      <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-      <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
      </component>
      <component name="swiconfig" long-name="Software Install Config" introduced="9.1" class="config" purpose="optional">
-      <unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
      </component>
     </collection>
     <collection name="secureswitools" long-name="Secure Software Install Tools">
      <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
      </component>
      <component name="openssllib" long-name="OpenSSL Library" class="PC">
       <unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
      </component>
      <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
      </component>
      <component name="swisistools" long-name="Secure Software Install SIS Tools" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
      </component>
     </collection>
     <collection name="appinstaller" long-name="App Installer" level="generic">
      <component name="AppMngr2" long-name="App Mngr2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstaller/AppMngr2/group"/>
      </component>
      <component name="AppinstUi" long-name="App Installer UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstaller/AppinstUi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Sisx" long-name="Sisx">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstaller/AppMngr2/Sisx/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Widget" long-name="Widget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstaller/AppMngr2/Widget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appinstaller" long-name="appinstaller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstaller/group"/>
      </component>
     </collection>
     <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="specific">
      <component name="iaupdateapi_stub.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="iaupdateapi_stub" long-name="iaupdateapi_stub">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
      </component>
     </collection>
     <collection name="ncdengine" long-name="NCD Engine" level="framework">
      <component name="debuglogger" long-name="Debug Logger">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/>
      </component>
      <component name="engine">
-      <unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ncdengine" long-name="ncdengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/ncdengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appinstall" long-name="appinstall">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appinstall" long-name="appinstall">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appinstall_plat" long-name="appinstall_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appmngr2runtimeapi" long-name="appmngr2runtimeapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appinstall_plat" long-name="appinstall_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iaupdate_api" long-name="iaupdate_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sw_installer_common_ui_api" long-name="sw_installer_common_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sw_installer_cr_keys" long-name="sw_installer_cr_keys">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sw_installer_launcher_api" long-name="sw_installer_launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sw_installer_ps_keys" long-name="sw_installer_ps_keys">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sw_installer_ui_plugin_api" long-name="sw_installer_ui_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="task_management_api" long-name="task_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="task_plugin_api" long-name="task_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="appinstall_pub" long-name="appinstall_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appinstall_pub" long-name="appinstall_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startup_list_management_api" long-name="startup_list_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="iaupdate" long-name="iaupdate">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iaupdate" long-name="iaupdate">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="api" long-name="api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="backgroundchecker" long-name="backgroundchecker">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/backgroundchecker/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="enabler" long-name="enabler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/enabler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="firmwareupdate" long-name="firmwareupdate">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/firmwareupdate/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IAD" long-name="IAD">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="launcher" long-name="launcher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/launcher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui" long-name="ui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/ui/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/contentdownload/ui/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="updater" long-name="updater">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/updater/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="updaterfiles" long-name="updaterfiles">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/appinstall/iaupdate/IAD/updater/updaterfiles/group"/>
      </component>
     </collection>
@@ -15514,96 +16294,100 @@
    <block long-name="Service API Framework" level="specific" name="serviceapifw" levels="plugin framework server generic specific">
     <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
      <component name="servicehandler" long-name="Service Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="languageinterworkingfw" long-name="languageinterworkingfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/group"/>
      </component>
     </collection>
     <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
      <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
      </component>
      <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
      </component>
      <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtsecuritymanager" long-name="rtsecuritymanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="serviceapifw" long-name="serviceapifw">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapifw" long-name="serviceapifw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="serviceapifw_plat" long-name="serviceapifw_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapifw_plat" long-name="serviceapifw_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_criteria_api" long-name="liw_criteria_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_generic_parameter_api" long-name="liw_generic_parameter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_provider_utility_api" long-name="liw_provider_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_service_handler_api" long-name="liw_service_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_service_interface_base_api" long-name="liw_service_interface_base_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="liw_service_interface_menu_api" long-name="liw_service_interface_menu_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtsecuritymanager_client_api" long-name="rtsecuritymanager_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtsecuritymanager_common_api" long-name="rtsecuritymanager_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtsecuritymanager_utility_api" long-name="rtsecuritymanager_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="serviceapifw_pub" long-name="serviceapifw_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapifw_pub" long-name="serviceapifw_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
      </component>
     </collection>
@@ -15611,89 +16395,139 @@
    <block long-name="Service API" level="specific" name="serviceapi" levels="os mw1 mw2 app">
     <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
      <component name="appmanagerprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_applicationmanager/group"/>
      </component>
      <component name="appmanagerservice" long-name="App Manager Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_applicationmanager/appmanagerservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_applicationmanager" long-name="sapi_applicationmanager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_applicationmanager/group"/>
+     </component>
     </collection>
     <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
      <component name="calendarprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_calendar/group"/>
      </component>
      <component name="calendarservice" long-name="Calendar Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_calendar/calendarservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_calendar" long-name="sapi_calendar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_calendar/group"/>
+     </component>
     </collection>
     <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
      <component name="contactprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_contacts_vpbk/group"/>
      </component>
      <component name="contactservice" long-name="Contact Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_contacts_vpbk/contactservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_contacts_vpbk" long-name="sapi_contacts_vpbk">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_contacts_vpbk/group"/>
+     </component>
     </collection>
     <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
      <component name="landmarkprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_landmarks/group"/>
      </component>
      <component name="landmarksservice" long-name="Landmarks Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_landmarks/landmarksservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_landmarks" long-name="sapi_landmarks">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_landmarks/group"/>
+     </component>
     </collection>
     <collection name="sapi_location" long-name="SAPI Location" level="mw2">
      <component name="locationprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_location/group"/>
      </component>
      <component name="locationservice" long-name="Location Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_location/locationservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_location" long-name="sapi_location">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_location/group"/>
+     </component>
     </collection>
     <collection name="sapi_logging" long-name="SAPI Logging" level="app">
      <component name="loggingprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_logging/group"/>
      </component>
      <component name="loggingservice" long-name="Logging Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_logging/loggingservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_logging" long-name="sapi_logging">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_logging/group"/>
+     </component>
     </collection>
     <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
      <component name="mediamanagementprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_mediamanagement/group"/>
      </component>
      <component name="mediamanagementservice" long-name="Media Management Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_mediamanagement/mediamanagementservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_mediamanagement" long-name="sapi_mediamanagement">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_mediamanagement/group"/>
+     </component>
     </collection>
     <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
      <component name="messagingprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_messaging/group"/>
      </component>
      <component name="messagingservice" long-name="Messaging Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_messaging/messagingservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_messaging" long-name="sapi_messaging">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_messaging/group"/>
+     </component>
     </collection>
     <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
      <component name="sensorprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_sensor/group"/>
      </component>
      <component name="sensorservice" long-name="Sensor Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_sensor/sensorservice/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_sensor" long-name="sapi_sensor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_sensor/group"/>
+     </component>
     </collection>
     <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
      <component name="sysinfoprovider.dll=binary">
-      <unit bldFile="mw/serviceapi/sapi_sysinfo/group"/>
      </component>
      <component name="sysinfoservice" long-name="Sysinfo Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/sapi_sysinfo/sysinfoservice/group"/>
      </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sapi_sysinfo" long-name="sapi_sysinfo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/serviceapi/sapi_sysinfo/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="serviceapi" long-name="serviceapi">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapi" long-name="serviceapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/serviceapi/group"/>
      </component>
     </collection>
@@ -15701,450 +16535,490 @@
    <block long-name="Web" level="specific" name="web" levels="plugin framework server generic specific">
     <collection name="browserutilities" long-name="Browser Utilities" level="generic">
      <component name="aiwbrowserprovider" long-name="AIW Browser Provider">
-      <unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/browserutilities/aiwbrowserprovider/Group"/>
      </component>
      <component name="browserdialogsprovider" long-name="Browser Dialogs Provider">
-      <unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/browserutilities/browserdialogsprovider/Group"/>
      </component>
      <component name="browsertelservice" long-name="Browser Tel Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
      </component>
      <component name="connectionmanager">
-      <unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/common/connectionmanager/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/browserutilities/connectionmanager/Group"/>
      </component>
      <component name="cxmllibrary" long-name="CXml Library">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
      </component>
      <component name="downloadmgr" long-name="Download Manager">
-      <unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/browserutilities/downloadmgr/Group"/>
      </component>
      <component name="favouritesengine" long-name="Favourites Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
      </component>
      <component name="feedsengine" long-name="Feeds Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/feedsengine/group"/>
      </component>
      <component name="multipartparser" long-name="Multipart Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/multipartparser/group"/>
      </component>
      <component name="recenturlstore" long-name="Recent URL Store">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
      </component>
      <component name="schemehandler" long-name="Scheme Handler">
-      <unit bldFile="mw/web/browserutilities/schemehandler/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/browserutilities/schemehandler/Group"/>
      </component>
      <component name="webutils" long-name="Web Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/webutils/group"/>
      </component>
      <component name="xmlparser" long-name="XML Parser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/xmlparser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DownloadMgrClntSrv" long-name="DownloadMgrClntSrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/downloadmgr/DownloadMgrClntSrv/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DownloadMgrServEng" long-name="DownloadMgrServEng">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/downloadmgr/DownloadMgrServEng/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DownloadMgrUiLib" long-name="DownloadMgrUiLib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/downloadmgr/DownloadMgrUiLib/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ClientServer" long-name="ClientServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/favouritesengine/ClientServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Api" long-name="Api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/feedsengine/FeedsServer/Api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Reconizer" long-name="Reconizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/feedsengine/FeedsServer/Reconizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browserutilities" long-name="browserutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SchemeApp" long-name="SchemeApp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/schemehandler/SchemeApp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SchemeDispatcher" long-name="SchemeDispatcher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/browserutilities/schemehandler/SchemeDispatcher/group"/>
      </component>
     </collection>
     <collection name="codhandler" long-name="COD Handler" level="specific">
      <component name="coddownload" long-name="COD Download">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/coddownload/group"/>
      </component>
      <component name="codeng" long-name="COD Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/codeng/group"/>
      </component>
      <component name="codrecog" long-name="COD Recogniser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/codrecog/group"/>
      </component>
      <component name="codui" long-name="COD UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/codui/group"/>
      </component>
      <component name="codviewer" long-name="COD Viewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/codviewer/group"/>
      </component>
      <component name="ddrecog" long-name="DD Recogniser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/ddrecog/group"/>
      </component>
      <component name="ddviewer" long-name="DD Viewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/ddviewer/group"/>
      </component>
      <component name="roapapp" long-name="ROAP Application">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/roapapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="codhandler" long-name="codhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/codhandler/group"/>
      </component>
     </collection>
     <collection name="webengine" long-name="Web Engine" level="server">
      <component name="browserrecognizers" long-name="Browser Recognizers">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/browserrecognizers/group"/>
      </component>
      <component name="device" long-name="Device">
-      <unit bldFile="mw/web/webengine/device/group"/>
      </component>
      <component name="memoryplugin" long-name="Memory Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/memoryplugin/group"/>
      </component>
      <component name="osswebengine" long-name="OSS Web Engine">
-      <unit bldFile="mw/web/webengine/osswebengine/group"/>
      </component>
      <component name="pagescaler" long-name="Page Scaler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/pagescaler/group"/>
      </component>
      <component name="webkitutils" long-name="WebKit Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/webkitutils/group"/>
      </component>
      <component name="widgetbackuprestore" long-name="Widget Backup Restore">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
      </component>
      <component name="widgetengine" long-name="Widget Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/widgetengine/group"/>
      </component>
      <component name="widgetinstaller" long-name="Widget Installer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/widgetinstaller/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/widgets/widgetinstaller/group"/>
      </component>
      <component name="widgetmemoryplugin" long-name="Widget Memory Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
      </component>
      <component name="widgetregistry" long-name="Widget Registry">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/widgetregistry/group"/>
      </component>
      <component name="wmlengine" long-name="WML Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/adt"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/browser"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/css"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/evt"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/fbox"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/fileloader"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/gdi"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/hed"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/htmlp"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/image"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/imagech"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/lmgr"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/markup"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/Msg"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/object"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/script"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/system"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/text"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/Unicode"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/urlloader"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/wml"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/wml1x"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/wmlengine"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/wmlscriptch"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wmlengine/group/xhtml"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webengine" long-name="webengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cache" long-name="cache">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MemoryManager" long-name="MemoryManager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/MemoryManager/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="npscript" long-name="npscript">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60" long-name="s60">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/browserengine"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/JavaScriptCore"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/libxml2"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/plugins"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/bindings"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/bridge"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/dom"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/editing"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/history"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/html"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/loader"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/page"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/platform"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/rendering"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webcore/xml"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/group/webkit"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/player/snddecoders/platform/symbian/s60"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webview_api_test" long-name="webview_api_test">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/osswebengine/WebKit/s60/webview/webview_api_test/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rt_gesturehelper" long-name="rt_gesturehelper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/webkitutils/rt_gesturehelper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wrtharvester" long-name="wrtharvester">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/webengine/wrtharvester/group"/>
      </component>
     </collection>
     <collection name="widgets" long-name="Widgets" level="generic">
      <component name="widgetapp" long-name="Widget App">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/widgets/widgetapp/group"/>
      </component>
      <component name="widgetinstaller">
-      <unit bldFile="mw/web/widgets/widgetinstaller/group"/>
      </component>
      <component name="widgetlauncher" long-name="Widget Launcher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/widgets/widgetlauncher/group"/>
      </component>
      <component name="widgetpreInstaller" long-name="Widget Pre Installer">
-      <unit bldFile="mw/web/widgets/widgetpreInstaller/group"/>
      </component>
      <component name="widgetrecognizer" long-name="Widget Recognizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/widgets/widgetrecognizer/group"/>
      </component>
      <component name="widgetstartup" long-name="Widget Startup">
-      <unit bldFile="mw/web/widgets/widgetstartup/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/widgets/widgetstartup/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="widgets" long-name="widgets">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/widgets/group"/>
      </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="widgetpreinstaller" long-name="widgetpreinstaller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="mw/web/widgets/widgetpreinstaller/Group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="web" long-name="web">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web" long-name="web">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="web_plat" long-name="web_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiw_browser_provider_api" long-name="aiw_browser_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browser_dialogs_provider_api" long-name="browser_dialogs_provider_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browser_platform_api" long-name="browser_platform_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cod_handler_api" long-name="cod_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="connection_manager_api" long-name="connection_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cxml_library_api" long-name="cxml_library_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="download_mgr_client_api_extn" long-name="download_mgr_client_api_extn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="feeds_engine_api" long-name="feeds_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_plat" long-name="web_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="launcher_api" long-name="launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/launcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multipart_parser_api" long-name="multipart_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="recent_url_store_api" long-name="recent_url_store_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rt_gesturehelper_api" long-name="rt_gesturehelper_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scheme_handler_plugin_api" long-name="scheme_handler_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="scriptable_plugin_api" long-name="scriptable_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webutils_api" long-name="webutils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/webutils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="widget_registry_api" long-name="widget_registry_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_parser_api" long-name="xml_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="web_pub" long-name="web_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browser_control_api" long-name="browser_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browser_plugin_api" long-name="browser_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="download_mgr_client_api" long-name="download_mgr_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="download_mgr_ui_api" long-name="download_mgr_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="favourites_engine_api" long-name="favourites_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_pub" long-name="web_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settings_api" long-name="settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/web/web_pub/settings_api/group"/>
      </component>
     </collection>
@@ -16152,152 +17026,178 @@
    <block long-name="Web Services" level="generic" name="websrv" levels="plugin framework server generic specific">
     <collection name="webservices" long-name="Web Services" level="generic">
      <component name="wsnotifierplugins" long-name="WS Notifier Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
      </component>
      <component name="wslogger" long-name="WS Logger">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wslogger/group"/>
      </component>
      <component name="wsxml" long-name="WS XML">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsxml/group"/>
      </component>
      <component name="wsutils" long-name="WS Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsutils/group"/>
      </component>
      <component name="wsfragment" long-name="WS Fragment">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsfragment/group"/>
      </component>
      <component name="wsdescription" long-name="WS Description">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsdescription/group"/>
      </component>
      <component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
      </component>
      <component name="wsconnection" long-name="WS Connection">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsconnection/group"/>
      </component>
      <component name="wshostletconnection" long-name="WS Hostlet Connection">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
      </component>
      <component name="wscredentialmanager" long-name="WS Credential Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
      </component>
      <component name="wsmanager" long-name="WS Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsmanager/group"/>
      </component>
      <component name="wsidentitymanager" long-name="WS Identity Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
      </component>
      <component name="wsframework" long-name="WS Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsframework/group"/>
      </component>
      <component name="wsmessages" long-name="WS Messages">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsmessages/group"/>
      </component>
      <component name="wsconnectionagent" long-name="WS Connection Agent">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
      </component>
      <component name="idwsfplugin" long-name="IDWSF Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
      </component>
      <component name="wsibasicplugin" long-name="WSI Basic Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
      </component>
      <component name="wsrestplugin" long-name="WS Rest Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
      </component>
      <component name="idwsfsecuritymechanism" long-name="IDWSF Security Mechanism">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
      </component>
      <component name="wspasswordtransforms" long-name="WS Password Transforms">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
      </component>
      <component name="wscore" long-name="WS Core">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wscore/group"/>
      </component>
      <component name="wsprovider" long-name="WS Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsprovider/group"/>
      </component>
      <component name="wslocaltransportplugin" long-name="WS Local Transport Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
      </component>
      <component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
      </component>
      <component name="wsstar" long-name="WS Star">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsstar/group"/>
      </component>
      <component name="wsoviplugin" long-name="WS Ovi Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webservices" long-name="webservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wsstarmessagehandlers" long-name="wsstarmessagehandlers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wsstarplugin" long-name="wsstarplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsstar/wsstarplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wsstarpolicy" long-name="wsstarpolicy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="websrv" long-name="websrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="websrv" long-name="websrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="websrv_pub" long-name="websrv_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="websrv_pub" long-name="websrv_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hostlet_connection_api" long-name="hostlet_connection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_service_connection_api" long-name="web_service_connection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_service_description_api" long-name="web_service_description_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_service_manager_api" long-name="web_service_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web_service_messaging_api" long-name="web_service_messaging_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_extensions_api" long-name="xml_extensions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xml_fragment_api" long-name="xml_fragment_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
      </component>
     </collection>
@@ -16305,36 +17205,34 @@
    <block long-name="Conn Tools" level="generic" name="conntools" levels="1 2">
     <collection name="emulatorlan" long-name="Emulator Lan" level="1">
      <component name="emulatorlan compo" long-name="Emulator LAN Component">
-      <unit bldFile="mw/conntools/emulatorlan/emulatorlan compo/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emulatorlan" long-name="emulatorlan">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conntools/emulatorlan/group"/>
      </component>
     </collection>
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test">
-      <unit bldFile="mw/conntools/nettools/conntest/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conntools/nettools/conntest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="probe" long-name="probe">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conntools/nettools/conntest/probe/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nettools" long-name="nettools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conntools/nettools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="conntools" long-name="conntools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conntools" long-name="conntools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conntools/group"/>
      </component>
     </collection>
@@ -16342,26 +17240,24 @@
    <block long-name="Platform Tools" level="generic" name="platformtools">
     <collection name="gfxconversion" long-name="Graphics Conversion">
      <component name="bmconv_s60" long-name="Bm Conv S60">
-      <unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/platformtools/gfxconversion/bmconv_s60/group"/>
      </component>
      <component name="mifconv" long-name="Mifconv">
-      <unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gfxconversion" long-name="gfxconversion">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/platformtools/gfxconversion/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="platformtools" long-name="platformtools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="platformtools" long-name="platformtools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/platformtools/group"/>
      </component>
     </collection>
@@ -16369,76 +17265,83 @@
    <block long-name="UI Tools" level="specific" name="uitools" levels="compile encode tool">
     <collection name="gfxtools" long-name="Graphics Tools" level="tool">
      <component name="Color">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/gfxtools/Color/group"/>
      </component>
      <component name="gditools" long-name="GDI Tools">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gfxtools" long-name="gfxtools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/gfxtools/group"/>
      </component>
     </collection>
     <collection name="reszip" long-name="Reszip" level="encode">
      <component name="reszip.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="reszip" long-name="reszip">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/reszip/group"/>
      </component>
     </collection>
     <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
      <component name="svgtenc" long-name="SVGT Enc">
-      <unit bldFile="mw/uitools/svgtencoder/svgtenc/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgtencoder" long-name="svgtencoder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/svgtencoder/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="standalone" long-name="standalone">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
      </component>
     </collection>
     <collection name="toollibraries" long-name="Tool Libraries" level="tool">
      <component name="Arabica">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/toollibraries/Arabica/group"/>
      </component>
      <component name="XercesC" long-name="Xerces C">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/toollibraries/XercesC/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="toollibraries" long-name="toollibraries">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/toollibraries/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uitools" long-name="uitools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uitools" long-name="uitools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uitools_plat" long-name="uitools_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uitools_plat" long-name="uitools_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/uitools_plat/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="uitools_pub" long-name="uitools_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uitools_pub" long-name="uitools_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/uitools_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="third_party_bitmap_palette_api" long-name="third_party_bitmap_palette_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
      </component>
     </collection>
@@ -16448,169 +17351,202 @@
    <block long-name="Location Apps" level="apps" name="location" levels="engine ui apps">
     <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
      <component name="blid" long-name="Blid">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui" long-name="ui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/basiclocationinfodisplay/blid/ui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="basiclocationinfodisplay" long-name="basiclocationinfodisplay">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/basiclocationinfodisplay/group"/>
      </component>
     </collection>
     <collection name="eventsui" long-name="Events UI" level="ui">
      <component name="eventseditor" long-name="Events Editor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventseditor/group"/>
      </component>
      <component name="eventsengine" long-name="Events Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventsengine/group"/>
      </component>
      <component name="eventshandlerui" long-name="Events Handler UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/group"/>
      </component>
      <component name="eventsmgmtui" long-name="Events Mgmt UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
      </component>
      <component name="eventsutils" long-name="Events Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventsutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eventshandler" long-name="eventshandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventshandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eventshandlerapp" long-name="eventshandlerapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventshandlerapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eventshandlerserver" long-name="eventshandlerserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventshandlerserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecom" long-name="ecom">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventsnotifier/ecom/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="evtinfonote" long-name="evtinfonote">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventsnotifier/evtinfonote/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eventsnotifier" long-name="eventsnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/eventshandlerui/eventsnotifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eventsui" long-name="eventsui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/eventsui/group"/>
      </component>
     </collection>
     <collection name="landmarksui" long-name="Landmarks UI" level="ui">
      <component name="app" long-name="Application">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/landmarksui/app/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/logging/app/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/poc/pocui/app/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforNcnlistAPI/app/group"/>
      </component>
      <component name="commonui" long-name="Common UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/landmarksui/commonui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/commonui/group"/>
      </component>
      <component name="engine">
-      <unit bldFile="app/location/landmarksui/engine/group"/>
      </component>
      <component name="msgviewer" long-name="Message Viewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/landmarksui/msgviewer/group"/>
      </component>
      <component name="uicontrols" long-name="UI Controls">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/landmarksui/uicontrols/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarksui" long-name="landmarksui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/landmarksui/group"/>
      </component>
     </collection>
     <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
      <component name="lmrefapp.exe=binary">
-      <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="locationlandmarksrefappfors60" long-name="locationlandmarksrefappfors60">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/location/locationlandmarksrefappfors60/Group"/>
      </component>
     </collection>
     <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
      <component name="LmUiRefApp.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="locationlandmarksuirefapp" long-name="locationlandmarksuirefapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
      </component>
     </collection>
     <collection name="locationnokiaprivacyadaptationrefimpl" long-name="Privacy Adaptation Nokia Reference Implementation" level="engine">
      <component name="privlistref.exe=binary">
-      <unit bldFile="app/location/locationnokiaprivacyadaptationrefimpl/group"/>
      </component>
     </collection>
     <collection name="locationrefappfors60" long-name="Location Reference App for S60" level="apps">
      <component name="LBSReference.exe=binary">
-      <unit bldFile="app/location/locationrefappfors60/group"/>
      </component>
     </collection>
     <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
      <component name="SatelliteReference.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="locationsatviewrefapp" long-name="locationsatviewrefapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/locationsatviewrefapp/group"/>
      </component>
     </collection>
     <collection name="locationsimulationpsy10" long-name="Location Simulation PSY10" level="engine">
      <component name="epossimulationpsy.dll=binary">
-      <unit bldFile="app/location/locationsimulationpsy10/group"/>
      </component>
     </collection>
     <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
      <component name="MnRefProviderPlugin.dll=binary">
-      <unit bldFile="app/location/mapnavproviderrefapp/group"/>
      </component>
      <component name="mnrefprovider.exe=binary">
-<!--       <unit bldFile="app/location/mapnavproviderrefapp/group"/> -->
      </component>
      <component name="mnrefproviderback.exe=binary">
-<!--       <unit bldFile="app/location/mapnavproviderrefapp/group"/> -->
      </component>
      <component name="mnrefproviderengine.dll=binary">
-<!--       <unit bldFile="app/location/mapnavproviderrefapp/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mapnavproviderrefapp" long-name="mapnavproviderrefapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/location/mapnavproviderrefapp/group"/>
      </component>
     </collection>
     <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
      <component name="simpsyui.exe=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="simpsyconfigurator" long-name="simpsyconfigurator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/simpsyconfigurator/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="location" long-name="location">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location" long-name="location">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="loc_pub" long-name="loc_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="loc_pub" long-name="loc_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/loc_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_ui_addedit_api" long-name="landmarks_ui_addedit_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="landmarks_ui_selector_api" long-name="landmarks_ui_selector_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
      </component>
     </collection>
@@ -16618,82 +17554,94 @@
    <block long-name="Multimedia Sharing UIs" level="services" name="mmsharinguis" levels="base plugin">
     <collection name="mmsharing" long-name="MM Sharing" level="base">
      <component name="mmshavailability" long-name="Multimedia Sharing Availability">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
      </component>
      <component name="mmshengine" long-name="Multimedia Sharing Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
      </component>
      <component name="mmshindicator" long-name="Multimedia Sharing Indicator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
      </component>
      <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
      </component>
      <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
      </component>
      <component name="mmshui" long-name="Multimedia Sharing UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsharing" long-name="mmsharing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharing/group"/>
      </component>
     </collection>
     <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
      <component name="mmcctranscoder" long-name="MMCC Transcoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
      </component>
      <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
      </component>
      <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
      </component>
      <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
      </component>
      <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
      </component>
      <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmshplugins" long-name="mmshplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmshplugins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmsharinguis" long-name="mmsharinguis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsharinguis" long-name="mmsharinguis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mmsharinguis_plat" long-name="mmsharinguis_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsharinguis_plat" long-name="mmsharinguis_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_sharing_manager_api" long-name="multimedia_sharing_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_sharing_resource_api" long-name="multimedia_sharing_resource_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimedia_sharing_settings_api" long-name="multimedia_sharing_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
      </component>
     </collection>
@@ -16701,235 +17649,259 @@
    <block long-name="Phone Apps" level="apps" span="2" name="phone" levels="engine ui apps">
     <collection name="phoneapp" long-name="Phone App" level="apps">
      <component name="Blacklist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/Blacklist/group"/>
      </component>
      <component name="phoneui" long-name="Phone UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneui/group"/>
      </component>
      <component name="phoneuicontrol" long-name="Phone UI Control">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
      </component>
      <component name="phoneuistates" long-name="Phone UI States">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
      </component>
      <component name="phoneuiutils" long-name="Phone UI Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
      </component>
      <component name="phoneuiview" long-name="Phone UI View">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
      </component>
      <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
      </component>
      <component name="silenceactionplugin" long-name="Silence Action Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phoneapp" long-name="phoneapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonemediatorcenter" long-name="phonemediatorcenter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
      </component>
     </collection>
     <collection name="phoneengine" long-name="Phone Engine" level="engine">
      <component name="PhoneCntFinder" long-name="Phone Contact Finder">
-      <unit bldFile="app/phone/phoneengine/PhoneCntFinder/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/phone/phoneengine/PhoneCntFinder/Group"/>
      </component>
      <component name="audiohandling" long-name="Audio Handling">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/audiohandling/group"/>
      </component>
      <component name="callhandling" long-name="Call Handling">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/callhandling/group"/>
      </component>
      <component name="contacthandling" long-name="Contact Handling">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/contacthandling/group"/>
      </component>
      <component name="loghandling" long-name="Log Handling">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/loghandling/group"/>
      </component>
      <component name="phonemodel" long-name="Phone Model">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/phonemodel/group"/>
      </component>
      <component name="servicehandling" long-name="Service Handling">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/servicehandling/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phoneengine" long-name="phoneengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneengine/group"/>
      </component>
     </collection>
     <collection name="phonesettings" long-name="Phone Settings" level="ui">
      <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
      </component>
      <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin">
-      <unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/phone/phonesettings/pslncallimageplugin/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonesettings" long-name="phonesettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phonesettings/group"/>
      </component>
     </collection>
     <collection name="phoneuis" long-name="Phone UIs" level="ui">
      <component name="BubbleManager" long-name="Bubble Manager">
-      <unit bldFile="app/phone/phoneuis/BubbleManager/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/phone/phoneuis/BubbleManager/Group"/>
      </component>
      <component name="ConnectUtil" long-name="Connect Util">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/ConnectUtil/group"/>
      </component>
      <component name="SFIUtils" long-name="SFI Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/SFIUtils/group"/>
      </component>
      <component name="TelephonyDeviceMode" long-name="Telephony Device Mode">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/TelephonyDeviceMode/group"/>
      </component>
      <component name="Ussd" long-name="USSD">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/Ussd/group"/>
      </component>
      <component name="dialer" long-name="Dialer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/dialer/group"/>
      </component>
      <component name="vmbx" long-name="Vmbx">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/vmbx/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bmcustomization" long-name="bmcustomization">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/BubbleManager/bmcustomization/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phoneuis" long-name="phoneuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gsvmbxplugin" long-name="gsvmbxplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneuis/vmbx/gsvmbxplugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phone" long-name="phone">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone" long-name="phone">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phone_plat" long-name="phone_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="3d_ringing_tone_enabler_api" long-name="3d_ringing_tone_enabler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dialer_keypad_api" long-name="dialer_keypad_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_plat" long-name="phone_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_application_commands_api" long-name="phone_application_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone_application_voip_commands_api" long-name="phone_application_voip_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sfi_utility_api" long-name="sfi_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/sfi_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_bubble_extension_api" long-name="telephony_bubble_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_comms_information_api" long-name="telephony_comms_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_configuration_api" long-name="telephony_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_device_mode_api" long-name="telephony_device_mode_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_information_api" long-name="telephony_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_logging_extension_api" long-name="telephony_logging_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_matching_extension_api" long-name="telephony_matching_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_mediator_api" long-name="telephony_mediator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_menu_extension_api" long-name="telephony_menu_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_microphone_mute_status_api" long-name="telephony_microphone_mute_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_remote_party_information_api" long-name="telephony_remote_party_information_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telephony_video_mailbox_settings_api" long-name="telephony_video_mailbox_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_telephony_mediator_api" long-name="video_telephony_mediator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="phoneplugins" long-name="phoneplugins">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phoneplugins" long-name="phoneplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="telbranding" long-name="telbranding">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/phone/phoneplugins/telbranding/group"/>
      </component>
     </collection>
@@ -16937,111 +17909,111 @@
    <block long-name="Video Telephony Apps" level="apps" name="videotelephony" levels="plugin engine ui">
     <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
      <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/packetvideoengine/PacketVideoEngineBinaries/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="packetvideoengine" long-name="packetvideoengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/packetvideoengine/group"/>
      </component>
     </collection>
     <collection name="packetvideoplugins" long-name="Packetvideo Plugins" level="plugin">
      <component name="DisplaySink" long-name="Display Sink">
-      <unit bldFile="app/videotelephony/packetvideoplugins/DisplaySink/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
      </component>
      <component name="VideoSource" long-name="Video Source">
-      <unit bldFile="app/videotelephony/packetvideoplugins/VideoSource/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
      </component>
     </collection>
     <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
      <component name="videotelcomms" long-name="Videotel Comms">
-      <unit bldFile="app/videotelephony/vtengines/videotelcomms/group"/>
      </component>
      <component name="videoteleng" long-name="Videotel Engine">
-      <unit bldFile="app/videotelephony/vtengines/videoteleng/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtengines" long-name="vtengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtengines/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CallCtrl" long-name="CallCtrl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtengines/videoteleng/CallCtrl/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Logger" long-name="Logger">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtengines/videoteleng/Logger/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtmediatorplugin" long-name="vtmediatorplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
      </component>
     </collection>
     <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
      <component name="videotelui" long-name="Video Telephony UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtuis" long-name="vtuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtuis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videotelephony" long-name="videotelephony">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videotelephony" long-name="videotelephony">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videotelephony_plat" long-name="videotelephony_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videotelephony_plat" long-name="videotelephony_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_telephony_control_mediator_api" long-name="video_telephony_control_mediator_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_telephony_media_configuration_api" long-name="video_telephony_media_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="vtprotocolplugins" long-name="vtprotocolplugins">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtprotocolplugins" long-name="vtprotocolplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtprotocolplugins/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="vtprotocols" long-name="vtprotocols">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtprotocols" long-name="vtprotocols">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtprotocols/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="vtprotocolsstub" long-name="vtprotocolsstub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtprotocolsstub" long-name="vtprotocolsstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
      </component>
     </collection>
@@ -17049,108 +18021,103 @@
    <block long-name="PoC" level="apps" name="poc" levels="engine ui">
     <collection name="pocengine" long-name="PoC Engine" level="engine">
      <component name="PoCEngineImplementation.dll=binary">
-      <unit bldFile="app/poc/pocengine/group"/>
      </component>
      <component name="PoCEngineResolver.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaCommon.DLL=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaDeviceManagementAdapter.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaEngine.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaPresenceHandler.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaPresenceHandlerResolver.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaSIPClientResolver.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaServer.exe=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="PoCOmaSettingsAdapter.dll=binary">
-<!--       <unit bldFile="app/poc/pocengine/group"/> -->
      </component>
      <component name="sipclientresolver" long-name="SIP Client Resolver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/pocengine/sipclientresolver/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="pocengine" long-name="pocengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/poc/pocengine/group"/>
+     </component>
     </collection>
     <collection name="pocui" long-name="PoC Ui" level="ui">
      <component name="PoCActionPlugin.dll=binary">
-      <unit bldFile="app/poc/pocui/group"/>
      </component>
      <component name="PoCBioPlugin.dll=binary">
-<!--       <unit bldFile="app/poc/pocui/group"/> -->
      </component>
      <component name="PoCGSPlugin.dll=binary">
-<!--       <unit bldFile="app/poc/pocui/group"/> -->
      </component>
      <component name="PoCIntegrationPlugin.dll=binary">
-<!--       <unit bldFile="app/poc/pocui/group"/> -->
      </component>
      <component name="PoCSourcePlugin.dll=binary">
-<!--       <unit bldFile="app/poc/pocui/group"/> -->
      </component>
      <component name="PoCUiIndicatorPlugin.dll=binary">
-<!--       <unit bldFile="app/poc/pocui/group"/> -->
      </component>
      <component name="PoCUiIntgr" long-name="PoC UI Intgr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/pocui/PoCUiIntgr/group"/>
      </component>
      <component name="app">
-      <unit bldFile="app/poc/pocui/app/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="pocui" long-name="pocui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/poc/pocui/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PoCUiAiwPlugin" long-name="PoCUiAiwPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/pocui/PoCUiIntgr/PoCUiAiwPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PoCUiEComPlugin" long-name="PoCUiEComPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/pocui/PoCUiIntgr/PoCUiEComPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PoCUiIntegrationServices" long-name="PoCUiIntegrationServices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/pocui/PoCUiIntgr/PoCUiIntegrationServices/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="poc" long-name="poc">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc" long-name="poc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="poc_plat" long-name="poc_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc_plat" long-name="poc_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/poc_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc_api" long-name="poc_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/poc_plat/poc_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc_sessions_api" long-name="poc_sessions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/poc_plat/poc_sessions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc_ui_integration_services_api" long-name="poc_ui_integration_services_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/poc/poc_plat/poc_ui_integration_services_api/group"/>
      </component>
     </collection>
@@ -17158,233 +18125,242 @@
    <block long-name="IP Telephony" level="apps" name="iptelephony" levels="plugin eng ui">
     <collection name="commsconfig" long-name="Comms Config" level="ui">
      <component name="cscapplicationui" long-name="CSC Application UI">
-      <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
      </component>
      <component name="cscengine" long-name="CSC Engine">
-      <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
      </component>
      <component name="cscsettingsui" long-name="CSC Settings UI">
-      <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
      </component>
      <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin">
-      <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
      </component>
     </collection>
     <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
      <component name="cchclient" long-name="CCH Client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
      </component>
      <component name="cchclientapi" long-name="CCH Clientapi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
      </component>
      <component name="cchserver" long-name="CCH Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
      </component>
      <component name="cchui" long-name="CCH UI">
-      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchui/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cchuinotif" long-name="cchuinotif">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/cchuinotif/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="convergedconnectionhandler" long-name="convergedconnectionhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
      </component>
     </collection>
     <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
      <component name="rcse2" long-name="Rcse2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="richcallsettingsengine" long-name="richcallsettingsengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/richcallsettingsengine/group"/>
      </component>
     </collection>
     <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
      <component name="svp.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sipvoipprovider" long-name="sipvoipprovider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
      </component>
     </collection>
     <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
      <component name="accountcreationplugin" long-name="Account Creation Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
      </component>
      <component name="dhcppositionprovider" long-name="DHCP Position Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
      </component>
      <component name="ipapputils" long-name="IP App Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
      </component>
      <component name="sipconnectionprovider" long-name="SIP Connection Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
      </component>
      <component name="sipmxresolver" long-name="SIP MX Resolver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
      </component>
      <component name="voipadapters" long-name="VOIP Adapters">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hslauncher" long-name="hslauncher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/hslauncher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hslauncherps" long-name="hslauncherps">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/hslauncher/hslauncherps/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hslauncherui" long-name="hslauncherui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/hslauncher/hslauncherui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voipplugins" long-name="voipplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voipeventlog" long-name="voipeventlog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/ipapputils/voipeventlog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipvoicemailengine" long-name="ipvoicemailengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svtcallmenu" long-name="svtcallmenu">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svtlogging" long-name="svtlogging">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svtmatching" long-name="svtmatching">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cpgenvoipsettings" long-name="cpgenvoipsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/cpgenvoipsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cpvoipadapter" long-name="cpvoipadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/cpvoipadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmgenvoipsettings" long-name="dmgenvoipsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/dmgenvoipsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dmvoipadapter" long-name="dmvoipadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/dmvoipadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioningfile" long-name="provisioningfile">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/provisioningfile/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="iptelephony" long-name="iptelephony">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iptelephony" long-name="iptelephony">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="callcontinuity" long-name="callcontinuity">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="callcontinuity" long-name="callcontinuity">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nsmldmvccadapter" long-name="nsmldmvccadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingsreader" long-name="settingsreader">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/settingsreader/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcc" long-name="vcc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vccclientprovisioningadapter" long-name="vccclientprovisioningadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcchotrigger" long-name="vcchotrigger">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vccpropertyhandler" long-name="vccpropertyhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vccutils" long-name="vccutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="iptel_plat" long-name="iptel_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cch_client_api" long-name="cch_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cch_server_api" long-name="cch_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="csc_settingsui_api" long-name="csc_settingsui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iptel_plat" long-name="iptel_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="richcallsettingsengine_api" long-name="richcallsettingsengine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vccpropertyhandler_api" long-name="vccpropertyhandler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcc_api" long-name="vcc_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
      </component>
     </collection>
@@ -17392,64 +18368,65 @@
    <block long-name="Settings UIs" level="services" name="settingsuis" levels="empty rsc ui">
     <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
      <component name="gsplugin">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
      </component>
      <component name="server">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
      </component>
      <component name="service" long-name="Service">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
      </component>
      <component name="services_db" long-name="Services Db">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="defaultapplicationsettings" long-name="defaultapplicationsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
      </component>
     </collection>
     <collection name="systemswuis" long-name="System SW UIs" level="ui">
      <component name="touchscreencalib" long-name="Touchscreen Calib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemswuis" long-name="systemswuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/systemswuis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="settingsuis" long-name="settingsuis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingsuis" long-name="settingsuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devmngt_plat" long-name="devmngt_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="default_app_client_api" long-name="default_app_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devmngt_plat" long-name="devmngt_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/devmngt_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="services_db_api" long-name="services_db_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devmngt_pub" long-name="devmngt_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devmngt_pub" long-name="devmngt_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/settingsuis/devmngt_pub/group"/>
      </component>
     </collection>
@@ -17457,256 +18434,254 @@
    <block long-name="Content Control Daemons" level="services" name="contentcontrol" levels="1 2">
     <collection name="applicationmanagement" long-name="Application Management" level="1">
      <component name="tarmappmng" long-name="Tarm App Mng">
-      <unit bldFile="app/contentcontrol/applicationmanagement/tarmappmng/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="applicationmanagement" long-name="applicationmanagement">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="amadapter2" long-name="amadapter2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/amadapter2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="options" long-name="options">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/options/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RfsPlugin" long-name="RfsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/RfsPlugin/group"/>
      </component>
     </collection>
     <collection name="customization" long-name="Customization" level="2">
      <component name="tarmcustomization" long-name="TARM Customization">
-      <unit bldFile="app/contentcontrol/customization/tarmcustomization/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="customization" long-name="customization">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DMUtils" long-name="DMUtils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/DMUtils/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EmbeddedLinkAdapter" long-name="EmbeddedLinkAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/EmbeddedLinkAdapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="isadapter" long-name="isadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/isadapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OperatorLogoAdapter" long-name="OperatorLogoAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/OperatorLogoAdapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ScreenSaverAdapter" long-name="ScreenSaverAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/ScreenSaverAdapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ScreenSaverServer" long-name="ScreenSaverServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/ScreenSaverAdapter/ScreenSaverServer/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="supadapter" long-name="supadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/supadapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ThemesAdapter" long-name="ThemesAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/ThemesAdapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ThemesTest" long-name="ThemesTest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/ThemesAdapter/ThemesTest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="UISettingsSrv" long-name="UISettingsSrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/UISettingsSrv/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="test" long-name="test">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/UISettingsSrv/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/datasource/manager/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/tagcollectionplugin/test"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/common/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/commonui/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/collectionmanager/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/test/Group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/test/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/layouts/test/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WallpaperAdapter" long-name="WallpaperAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/customization/tarmcustomization/WallpaperAdapter/bld"/>
      </component>
     </collection>
     <collection name="omads" long-name="OMA DS" level="1">
      <component name="omadsappui" long-name="OMA DS App UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
      </component>
      <component name="omadsextensions" long-name="OMA DS Extensions">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
      </component>
      <component name="syncmlnotifier" long-name="SyncML Notifier">
-      <unit bldFile="app/contentcontrol/omads/syncmlnotifier/group"/>
      </component>
      <component name="syncservice" long-name="Sync Service">
-      <unit bldFile="app/contentcontrol/omads/syncservice/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omads" long-name="omads">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AiwSyncProvider" long-name="AiwSyncProvider">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/AiwSyncProvider/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AspPreSyncPlugin" long-name="AspPreSyncPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/AspPreSyncPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AspScheduleHandler" long-name="AspScheduleHandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/AspScheduleHandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AspSyncUtil" long-name="AspSyncUtil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/AspSyncUtil/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OmaDsAppUiPlugin" long-name="OmaDsAppUiPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/OmaDsAppUiPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui" long-name="ui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsappui/ui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="agenda" long-name="agenda">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/agenda/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adapters" long-name="adapters">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bookmark" long-name="bookmark">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/bookmark/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts" long-name="contacts">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/contacts/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts_old" long-name="contacts_old">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/contacts_old/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="email" long-name="email">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/email/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/email/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms" long-name="mms">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/mms/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/mms/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sms" long-name="sms">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/sms/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/sms/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="datamod" long-name="datamod">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/datamod/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cgiscriptutils" long-name="cgiscriptutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/cgiscriptutils/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailxmlutils" long-name="emailxmlutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="contentcontrol" long-name="contentcontrol">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentcontrol" long-name="contentcontrol">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="contentctrl_plat" long-name="contentctrl_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentctrl_plat" long-name="contentctrl_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_ds_email_client_mtm_api" long-name="oma_ds_email_client_mtm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_email_client_mtm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oma_ds_presync_plugin_api" long-name="oma_ds_presync_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
      </component>
     </collection>
@@ -17714,204 +18689,210 @@
    <block long-name="Device Control Daemons" level="services" name="devicecontrol" levels="1 2">
     <collection name="devicediagnostics" long-name="Device Diagnostics" level="2">
      <component name="devdiagapp" long-name="Dev Diag App">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
      </component>
      <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
      </component>
      <component name="diagplugins" long-name="Diag Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
      </component>
      <component name="diagsuites" long-name="Diag Suites">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagbatterychargerplugin" long-name="diagbatterychargerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagbatterychargerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagbrowserplugin" long-name="diagbrowserplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagbrowserplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagdatanetworkplugin" long-name="diagdatanetworkplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagdatanetworkplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagearpieceplugin" long-name="diagearpieceplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagearpieceplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagexternalmediacardplugin" long-name="diagexternalmediacardplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagexternalmediacardplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagheadsetcableplugin" long-name="diagheadsetcableplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagheadsetcableplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DiagInternalMemoryPlugin" long-name="DiagInternalMemoryPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagloudspeakerplugin" long-name="diagloudspeakerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagloudspeakerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagnetcoverageplugin" long-name="diagnetcoverageplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagnetcoverageplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagusbcableplugin" long-name="diagusbcableplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagusbcableplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagvibrateplugin" long-name="diagvibrateplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/diagvibrateplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagconnectivitysuiteplugin" long-name="diagconnectivitysuiteplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagcoveragesuiteplugin" long-name="diagcoveragesuiteplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diaghardwaresuiteplugin" long-name="diaghardwaresuiteplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagservicessuiteplugin" long-name="diagservicessuiteplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/diagservicessuiteplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="diagtoplevelsuiteplugin" long-name="diagtoplevelsuiteplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicediagnostics" long-name="devicediagnostics">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
      </component>
     </collection>
     <collection name="fotaapplication" long-name="FOTA Application" level="2">
      <component name="fotaserver" long-name="FOTA Server">
-      <unit bldFile="app/devicecontrol/fotaapplication/fotaserver/group"/>
      </component>
     </collection>
     <collection name="omadm" long-name="OMA Device Management" level="1">
      <component name="omadmappui" long-name="OMA DM App UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
      </component>
      <component name="omadmextensions" long-name="OMA DM Extensions">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omadm" long-name="omadm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="OmaDmCPPlugin" long-name="OmaDmCPPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmappui/OmaDmCPPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browseradapter" long-name="browseradapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/browseradapter/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devdetail" long-name="devdetail">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/devdetail/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devinfo" long-name="devinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/devinfo/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fota" long-name="fota">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/fota/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imps" long-name="imps">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/imps/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmldm" long-name="syncmldm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmldm12" long-name="syncmldm12">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm12/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="syncmlds" long-name="syncmlds">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmlds/bld"/>
      </component>
     </collection>
     <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="1">
      <component name="pnpms" long-name="PnP MS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pnpmobileservices" long-name="pnpmobileservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/pnpmobileservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ServiceHelpPlugin" long-name="ServiceHelpPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/ServiceHelpPlugin/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="devicecontrol" long-name="devicecontrol">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicecontrol" long-name="devicecontrol">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="omacp" long-name="omacp">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omacp" long-name="omacp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omacp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EmailAdapter" long-name="EmailAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omacp/omacpadapters/EmailAdapter/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omacpadapters" long-name="omacpadapters">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
      </component>
     </collection>
@@ -17919,259 +18900,208 @@
    <block name="pcsuite" level="apps" long-name="PC Suite" levels="pcsuite-lib pcsuite-control pcsuite-mm pcsuite">
     <collection name="ApplicationInstaller" long-name="Application Installer" level="pcsuite-control">
      <component name="ApplicationInstallerApp" long-name="Application Installer" Application="Application Installer 2.1" Modules="NAI2-UI">
-      <unit bldFile="app/pcsuite/ApplicationInstaller/ApplicationInstallerApp/group"/>
      </component>
     </collection>
     <collection name="ConnectionManager" long-name="Connection Manager" level="pcsuite-control">
      <component name="ConneMgr" long-name="Connection Manager" Application="Connection Manager 2" Modules="Application, Cpl">
-      <unit bldFile="app/pcsuite/ConnectionManager/ConneMgr/group"/>
      </component>
     </collection>
     <collection name="ContentCopier" long-name="Content Copier" level="pcsuite-control">
      <component name="ContentCopierApp" long-name="Content Copier" Application="Content Copier 4" Modules="NCC4">
-      <unit bldFile="app/pcsuite/ContentCopier/ContentCopierApp/group"/>
      </component>
     </collection>
     <collection name="GetConnectedWizard" long-name="Get Connected Wizard" level="pcsuite-control">
      <component name="GetConnectedWizard" long-name="Get Connected Wizard" Application="Getting Connected Wizard" Modules="GCWizard">
-      <unit bldFile="app/pcsuite/GetConnectedWizard/GetConnectedWizard/group"/>
      </component>
     </collection>
     <collection name="Helps" level="pcsuite">
      <component name="AppHelps" Application="Helps" Modules="Helps_Series60">
-      <unit bldFile="app/pcsuite/Helps/AppHelps/group"/>
      </component>
     </collection>
     <collection name="ImageStore" long-name="Image Store" level="pcsuite-mm">
      <component name="ImageStoreApp" long-name="Image Store" Application="ImageStore" Modules="ImageStore">
-      <unit bldFile="app/pcsuite/ImageStore/ImageStoreApp/group"/>
      </component>
     </collection>
     <collection name="Installer" level="pcsuite-lib">
      <component name="InstallerEng" long-name="Installer Engine" Application="Installer" Modules="Core">
-      <unit bldFile="app/pcsuite/Installer/InstallerEng/group"/>
      </component>
      <component name="InstallerApp" long-name="Installer App" Application="Installer" Modules="UI">
-      <unit bldFile="app/pcsuite/Installer/InstallerApp/group"/>
      </component>
      <component name="PackerLibrary" long-name="Packer Library" Application="Installer" Modules="PackerLibrary">
-      <unit bldFile="app/pcsuite/Installer/PackerLibrary/group"/>
      </component>
     </collection>
     <collection name="3rdparty" long-name="3rd Party" level="pcsuite-lib">
      <component name="libpng" Application="Installer" Modules="PngLib">
-      <unit bldFile="app/pcsuite/3rdparty/libpng/group"/>
      </component>
      <component name="7zip" Application="Installer" Modules="7Zip">
-      <unit bldFile="app/pcsuite/3rdparty/7zip/group"/>
      </component>
      <component name="libjpeg" Application="PCSCM" Modules="PCSCM">
-      <unit bldFile="app/pcsuite/3rdparty/libjpeg/group"/>
      </component>
      <component name="zlib">
-      <unit bldFile="app/pcsuite/3rdparty/zlib/group"/>
      </component>
     </collection>
     <collection name="LaunchApplication" long-name="Launch Application" level="pcsuite">
      <component name="LaunchApplicationApp" long-name="Launch Application" Application="Launch Application NG" Modules="LaunchApplicationNG">
-      <unit bldFile="app/pcsuite/LaunchApplication/LaunchApplicationApp/group"/>
      </component>
     </collection>
     <collection name="MultimediaPlayer" long-name="Multimedia Player" level="pcsuite-mm">
      <component name="MultimediaPlayerApp" long-name="Multimedia Player" Application="Multimedia Player" Modules="CoolPlayer">
-      <unit bldFile="app/pcsuite/MultimediaPlayer/MultimediaPlayerApp/group"/>
      </component>
     </collection>
     <collection name="ImageConverter" long-name="Image Converter" level="pcsuite-mm">
      <component name="ImageConverterApp" long-name="Image Converter" Application="NIC" Modules="ImageConverter">
-      <unit bldFile="app/pcsuite/ImageConverter/ImageConverterApp/group"/>
      </component>
      <component name="ImageConverterCOC" long-name="Image Converter COC" Application="NIC" Modules="ImageConverter_COC">
-      <unit bldFile="app/pcsuite/ImageConverter/ImageConverterCOC/group"/>
      </component>
      <component name="ImageConverterGL" long-name="Image Converter GL" Application="NIC" Modules="ImageConverter_GL">
-      <unit bldFile="app/pcsuite/ImageConverter/ImageConverterGL/group"/>
      </component>
     </collection>
     <collection name="MusicManager" long-name="Music Manager" level="pcsuite-mm">
      <component name="MusicManagerApp" long-name="Music Manager" Application="Nokia Music Manager" Modules="NokiaMusicManager">
-      <unit bldFile="app/pcsuite/MusicManager/MusicManagerApp/group"/>
      </component>
     </collection>
     <collection name="OneTouchAccess" long-name="One Touch Access" level="pcsuite-lib">
      <component name="OneTouchAccessApp" long-name="One Touch Access" Application="One Touch Access" Modules="QuickGPRS">
-      <unit bldFile="app/pcsuite/OneTouchAccess/OneTouchAccessApp/group"/>
      </component>
     </collection>
     <collection name="PCSync" long-name="PC Sync" level="pcsuite-control">
      <component name="PCSyncNgr" long-name="PC Sync Ngr" Application="PC Sync 2" Modules="S60_PCS2_ngr">
-      <unit bldFile="app/pcsuite/PCSync/PCSyncNgr/group"/>
      </component>
      <component name="PCSyncApp" License="Other/prorietary">
-      <unit bldFile="app/pcsuite/PCSync/PCSyncApp/group"/>
      </component>
     </collection>
     <collection name="PhoneBrowser" long-name="Phone Browser" level="pcsuite">
      <component name="ContactsEditor" long-name="Contacts Editor" Application="Phone Browser 2" Modules="ContactsEditor">
-      <unit bldFile="app/pcsuite/PhoneBrowser/ContactsEditor/group"/>
      </component>
      <component name="vCard" Application="Phone Browser 2" Modules="NokiaVCard">
-      <unit bldFile="app/pcsuite/PhoneBrowser/vCard/group"/>
      </component>
      <component name="PhoneBrowserExt" long-name="Phone Browser Ext" Application="Phone Browser 3" Modules="PhoneBrowser">
-      <unit bldFile="app/pcsuite/PhoneBrowser/PhoneBrowserExt/group"/>
      </component>
      <component name="TextMessageEditor" long-name="Text Message Editor" Application="Text Message Editor" Modules="TextMessageFactory">
-      <unit bldFile="app/pcsuite/PhoneBrowser/TextMessageEditor/group"/>
      </component>
     </collection>
     <collection name="Common" level="pcsuite-lib">
      <component name="PCSCM" Application="PCSCM" Modules="PCSCM">
-      <unit bldFile="app/pcsuite/Common/PCSCM/group"/>
      </component>
      <component name="PCSL">
-      <unit bldFile="app/pcsuite/Common/PCSL/group"/>
      </component>
      <component name="ConfigurationServer" long-name="Configuration Server">
-      <unit bldFile="app/pcsuite/Common/ConfigurationServer/group"/>
      </component>
      <component name="MMCL">
-      <unit bldFile="app/pcsuite/Common/MMCL/group"/>
      </component>
      <component name="MCL">
-      <unit bldFile="app/pcsuite/Common/MCL/group"/>
      </component>
      <component name="codecs">
-      <unit bldFile="app/pcsuite/Common/codecs/group"/>
      </component>
     </collection>
     <collection name="tools" long-name="Tools" level="pcsuite-lib">
      <component name="GUIDChangingTool" long-name="GUID Changing Tool">
-      <unit bldFile="app/pcsuite/tools/GUIDChangingTool/group"/>
      </component>
      <component name="WIXGenerateGUIDs" long-name="WIX Generate GUIDs">
-      <unit bldFile="app/pcsuite/tools/WIXGenerateGUIDs/group"/>
      </component>
      <component name="SearchAndReplace" long-name="Search and Replace">
-      <unit bldFile="app/pcsuite/tools/SearchAndReplace/group"/>
      </component>
      <component name="BrandingTools" long-name="Branding Tools">
-      <unit bldFile="app/pcsuite/tools/BrandingTools/group"/>
      </component>
      <component name="CommonSelectDevice_Tester" long-name="Common Select Device Tester">
-      <unit bldFile="app/pcsuite/tools/CommonSelectDevice_Tester/group"/>
      </component>
      <component name="PCSLInfo" long-name="PCSL Info">
-      <unit bldFile="app/pcsuite/tools/PCSLInfo/group"/>
      </component>
      <component name="ColorMapper" long-name="Color Mapper">
-      <unit bldFile="app/pcsuite/tools/ColorMapper/group"/>
      </component>
      <component name="FileTransferUtility" long-name="File Transfer Utility">
-      <unit bldFile="app/pcsuite/tools/FileTransferUtility/group"/>
      </component>
      <component name="LocalizedTextViewer" long-name="Localized Text Viewer">
-      <unit bldFile="app/pcsuite/tools/LocalizedTextViewer/group"/>
      </component>
     </collection>
     <collection name="installation" long-name="Installation" level="pcsuite-lib">
      <component name="pcsuite" long-name="PC Suite Install" Application="S60 PCSuite MSI Installation Project" Modules="PCSuite">
-      <unit bldFile="app/pcsuite/installation/pcsuite/group"/>
      </component>
      <component name="InstTools" long-name="Installation Tools">
-      <unit bldFile="app/pcsuite/installation/InstTools/group"/>
      </component>
     </collection>
    </block>
    <block name="pccs" level="services" long-name="PCCS" levels="lib plat pccs">
     <collection name="pccs_sdk" long-name="PC SAPI" level="pccs">
      <component name="pcsapi" long-name="PCS API">
-      <unit bldFile="app/pccs/pccs_sdk/pcsapi/group"/>
      </component>
     </collection>
     <collection name="platform" long-name="Platform" level="plat">
      <component name="PCConnectivitySolution" long-name="PC Connectivity Solution">
-      <unit bldFile="app/pccs/platform/PCConnectivitySolution/group"/>
      </component>
      <component name="SLTester" long-name="CC Driver">
-      <unit bldFile="app/pccs/platform/SLTester/group"/>
      </component>
     </collection>
     <collection name="pccs_installation" long-name="PCCS Installation" level="lib">
      <component name="pccs" long-name="PCCS Install">
-      <unit bldFile="app/pccs/pccs_installation/pccs/group"/>
      </component>
      <component name="instCcdriver" long-name="CC Driver Install">
-      <unit bldFile="app/pccs/pccs_installation/instCcdriver/group"/>
      </component>
     </collection>
     <collection name="pccs_tools" long-name="PCCS Tools" level="lib">
      <component name="ConfServerCRCTest" long-name="Conf Server CRC Test">
-      <unit bldFile="app/pccs/pccs_tools/ConfServerCRCTest/group"/>
      </component>
      <component name="SLTester">
-      <unit bldFile="app/pccs/pccs_tools/SLTester/group"/>
      </component>
     </collection>
    </block>
    <block long-name="File Manager Apps" level="apps" name="files" levels="support apps">
     <collection name="filemanager" long-name="File Manager" level="apps">
      <component name="FileManager.exe=binary">
-      <unit bldFile="app/files/filemanager/group"/>
      </component>
      <component name="FileManagerEngine.dll=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="FileManagerView.dll=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="GFLM.dll=binary" long-name="GFLM">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="filemanageraiwprovider.dll=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="filemanagerbkupengine.dll=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="filemanagerbkupplugin.dll=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
      </component>
      <component name="filemanagerschbkup.exe=binary">
-<!--       <unit bldFile="app/files/filemanager/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="filemanager" long-name="filemanager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/files/filemanager/group"/>
      </component>
     </collection>
     <collection name="filesystemuis" long-name="File System UIs" level="support">
      <component name="memscaneng" long-name="Mem Scan Eng">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/filesystemuis/memscaneng/group"/>
      </component>
      <component name="memstatepopup" long-name="Mem State Popup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filesystemuis" long-name="filesystemuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/filesystemuis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="files" long-name="files">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="files" long-name="files">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="files_plat" long-name="files_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="files_plat" long-name="files_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/files_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memory_scan_popup_ui_api" long-name="memory_scan_popup_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
      </component>
     </collection>
@@ -18179,536 +19109,551 @@
    <block long-name="Contacts Apps" level="apps" span="2" name="contacts" levels="engine support services ui">
     <collection name="pimprotocols" long-name="PIM Protocols" level="services">
      <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2">
-      <unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
      </component>
      <component name="phonebooksync" long-name="Phonebook Sync" plugin="Y">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
      </component>
     </collection>
     <collection name="ccservices" long-name="CC Services" level="services">
      <component name="cmsservices" long-name="CMS Services">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bpas" long-name="bpas">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/bpas/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmscontactor" long-name="cmscontactor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/cmscontactor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Client" long-name="Client">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/Client/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmsengine" long-name="cmsengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Server" long-name="Server">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/Server/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactpresence" long-name="contactpresence">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/contactpresence/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presencetrafficlights" long-name="presencetrafficlights">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/cmsservices/presencetrafficlights/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccservices" long-name="ccservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/ccservices/group"/>
      </component>
     </collection>
     <collection name="contactextensions" long-name="Contact Extensions" level="services">
      <component name="predefinedcontacts" long-name="Predefined Contacts">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactextensions" long-name="contactextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contactextensions/group"/>
      </component>
     </collection>
     <collection name="logsui" long-name="Logs UI" level="ui">
      <component name="AocCtView.dll=binary" long-name="Aoc Ct View">
-      <unit bldFile="app/contacts/logsui/group"/>
      </component>
      <component name="Logs.exe=binary" long-name="Logs">
-<!--       <unit bldFile="app/contacts/logsui/group"/> -->
      </component>
      <component name="LogsClient.dll=binary">
-<!--       <unit bldFile="app/contacts/logsui/group"/> -->
      </component>
      <component name="LogsEng.dll=binary" long-name="Logs Engine">
-<!--       <unit bldFile="app/contacts/logsui/group"/> -->
      </component>
      <component name="LogsIndicatorPlugin.dll=binary">
-<!--       <unit bldFile="app/contacts/logsui/group"/> -->
      </component>
      <component name="LogsPlugin.dll=binary">
-<!--       <unit bldFile="app/contacts/logsui/group"/> -->
      </component>
      <component name="logsserviceextension" long-name="Logs Service Extension">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/logsui/logsserviceextension/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="logsui" long-name="logsui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/contacts/logsui/group"/>
+     </component>
     </collection>
     <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
      <component name="CntFindPlugin" long-name="Cnt Find Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/CntFindPlugin/group"/>
      </component>
      <component name="CntSortPlugin" long-name="Cnt Sort Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/CntSortPlugin/group"/>
      </component>
      <component name="contactsmodel" long-name="Contacts Model" introduced="ER5">
-      <unit version="1" bldFile="app/contacts/phonebookengines/contactsmodel/group" mrp="app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp"/>
-      <unit version="2" bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="app/contacts/phonebookengines/contactsmodel/group" mrp="app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="2" bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
      </component>
      <component name="VirtualPhonebook" long-name="Virtual Phonebook">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebookengines" long-name="phonebookengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VPbkCntModel" long-name="VPbkCntModel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/VPbkCntModel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VPbkEng" long-name="VPbkEng">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/VPbkEng/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VPbkEngUtils" long-name="VPbkEngUtils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/VPbkEngUtils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VPbkSimStoreImpl" long-name="VPbkSimStoreImpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="VPbkSimStoreService" long-name="VPbkSimStoreService">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreService/group"/>
      </component>
     </collection>
     <collection name="phonebookui" long-name="Phonebook UI" level="ui">
      <component name="Phonebook">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook/group"/>
      </component>
      <component name="Phonebook2" long-name="Phone Book 2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/group"/>
      </component>
      <component name="Speeddial" long-name="Speed Dial">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Speeddial/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebookui" long-name="phonebookui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccacommlauncherplugin" long-name="ccacommlauncherplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccacontactorservice" long-name="ccacontactorservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccacontactorservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccadetailsviewplugin" long-name="ccadetailsviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccaclient" long-name="ccaclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/ccaclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccapputil" long-name="ccapputil">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/ccapputil/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccapp" long-name="ccapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ccapplication" long-name="ccapplication">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Phonebook2/ccapplication/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speeddialgsplugin" long-name="speeddialgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/phonebookui/Speeddial/speeddialgsplugin/group"/>
      </component>
     </collection>
     <collection name="predictivesearch" long-name="Predictive Search" level="support">
      <component name="PcsAlgorithm" long-name="PCS Algorithm">
-      <unit bldFile="app/contacts/predictivesearch/PcsAlgorithm/group"/>
      </component>
      <component name="PcsServer" long-name="PCS Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/PcsServer/group"/>
      </component>
      <component name="PcsServerClientAPI" long-name="PCS Server Client API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/PcsServerClientAPI/group"/>
      </component>
      <component name="PcsUtils" long-name="PCS Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/PcsUtils/group"/>
      </component>
      <component name="adapters" long-name="Adapters">
-      <unit bldFile="app/contacts/predictivesearch/adapters/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts" long-name="contacts">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="predictivesearch" long-name="predictivesearch">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Algorithm1" long-name="Algorithm1">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/predictivesearch/PcsAlgorithm/Algorithm1/group"/>
      </component>
     </collection>
     <collection name="presencecache" long-name="Presence Cache" level="support">
      <component name="presencecacheclient2" long-name="Presence Cache Client2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/presencecache/presencecacheclient2/group"/>
      </component>
      <component name="presencecacheserver2" long-name="Presence Cache Server2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/presencecache/presencecacheserver2/group"/>
      </component>
      <component name="presencecacheutils" long-name="Presence Cache Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/presencecache/presencecacheutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presencecache" long-name="presencecache">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/presencecache/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="contacts" long-name="contacts">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts" long-name="contacts">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="contacts_plat" long-name="contacts_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cca_launch_api" long-name="cca_launch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cca_view_plugin_api" long-name="cca_view_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cms_client_api" long-name="cms_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/cms_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cms_contactor_api" long-name="cms_contactor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactpresence_api" long-name="contactpresence_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts_plat" long-name="contacts_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logs_application_engine_api" long-name="logs_application_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/logs_application_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logs_engine_api_extensions" long-name="logs_engine_api_extensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logs_timers_api" long-name="logs_timers_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logs_ui_command_line_api" long-name="logs_ui_command_line_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_commands_api" long-name="phonebook_2_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_common_ui_api" long-name="phonebook_2_common_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_icon_api" long-name="phonebook_2_icon_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_image_management_api" long-name="phonebook_2_image_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_presentation_api" long-name="phonebook_2_presentation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_store_configuration_management_api" long-name="phonebook_2_store_configuration_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_store_property_api" long-name="phonebook_2_store_property_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_thin_ui_extension_plugin_api" long-name="phonebook_2_thin_ui_extension_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_ui_controls_api" long-name="phonebook_2_ui_controls_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_ui_extension_api" long-name="phonebook_2_ui_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_ui_extension_definition_api" long-name="phonebook_2_ui_extension_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_ui_extension_plugin_api" long-name="phonebook_2_ui_extension_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_ui_utilities_api" long-name="phonebook_2_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_xsp_extension_manager_api" long-name="phonebook_2_xsp_extension_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_2_xsp_view_activation_api" long-name="phonebook_2_xsp_view_activation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_engine_extension_api" long-name="phonebook_engine_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_extension_api" long-name="phonebook_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_internal_appfw_api" long-name="phonebook_internal_appfw_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_internal_common_api" long-name="phonebook_internal_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_internal_data_management_api" long-name="phonebook_internal_data_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_internal_ui_utilities_api" long-name="phonebook_internal_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_public_constants_api" long-name="phonebook_public_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_thumbnails_api" long-name="phonebook_thumbnails_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_ui_controls_api" long-name="phonebook_ui_controls_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="predictivesearch_adapters_api" long-name="predictivesearch_adapters_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="predictivesearch_algorithm_api" long-name="predictivesearch_algorithm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="predictivesearch_client_api" long-name="predictivesearch_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="predictivesearch_utils_api" long-name="predictivesearch_utils_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presence_cache_api" long-name="presence_cache_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speed_dial_dialogs_api" long-name="speed_dial_dialogs_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_configuration_api" long-name="virtual_phonebook_configuration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_copy_policy_api" long-name="virtual_phonebook_copy_policy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_engine_api" long-name="virtual_phonebook_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_migration_support_api" long-name="virtual_phonebook_migration_support_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_policy_api" long-name="virtual_phonebook_policy_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_sim_services_api" long-name="virtual_phonebook_sim_services_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_store_api" long-name="virtual_phonebook_store_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_vcard_api" long-name="virtual_phonebook_vcard_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="virtual_phonebook_view_definition_api" long-name="virtual_phonebook_view_definition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="contacts_pub" long-name="contacts_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts_pub" long-name="contacts_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_data_addedit_ui_api" long-name="phonebook_data_addedit_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_data_management_api" long-name="phonebook_data_management_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_fetch_ui_api" long-name="phonebook_fetch_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_thumbnail_operation_api" long-name="phonebook_thumbnail_operation_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_ui_utilities_api" long-name="phonebook_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonebook_vcard_importexport_api" long-name="phonebook_vcard_importexport_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speed_dial_utility_control_api" long-name="speed_dial_utility_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
      </component>
     </collection>
@@ -18719,520 +19664,541 @@
       <unit mrp="app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
      </component>
      <component name="datamodel" long-name="Data Engine" introduced="5.0" deprecated="9.3">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
      </component>
      <component name="sheeteng" long-name="Sheet Engine" introduced="5.0" deprecated="9.3">
-      <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
      </component>
      <component name="wordeng" long-name="Word Engine" introduced="5.0" deprecated="9.3">
-      <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
      </component>
     </collection>
     <collection name="pimappservices" long-name="PIM App Services" level="services">
      <component name="agnmodel" long-name="Agenda Model" introduced="5.0" deprecated="9.1">
-      <unit bldFile="app/organizer/pimappservices/agnmodel/group" mrp="app/organizer/pimappservices/agnmodel/group/app-engines_agnmodel.mrp"/>
      </component>
      <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" class="test">
-      <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
      </component>
      <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" plugin="Y" introduced="8.1">
-      <unit version="1" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit.mrp"/>
-<!--       <unit version="2" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit.mrp"/>
      </component>
      <component name="appenginesdocs" long-name="Application Engines Documentation" class="doc">
       <unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
      </component>
      <component name="calendar" long-name="Calendar" introduced="9.2">
-      <unit version="1" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calinterimapi.mrp"/>
-<!--       <unit version="2" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="1" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calinterimapi.mrp"/>
      </component>
     </collection>
     <collection name="pimappsupport" long-name="PIM Application Support" level="support">
      <component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91">
-      <unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
      </component>
      <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
      </component>
      <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5">
-      <!-- Unit commented out by SF to match Bob's model -->
-      <!-- <unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/> -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
      </component>
     </collection>
     <collection name="alarmengines" long-name="Alarm Engines" level="engine">
      <component name="missedalarmstore" long-name="Missed Alarm Store">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarmengines" long-name="alarmengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/alarmengines/group"/>
      </component>
     </collection>
     <collection name="alarmui" long-name="Alarm UI" level="ui">
      <component name="AknAlarmService.dll=binary">
-      <unit bldFile="app/organizer/alarmui/group"/>
      </component>
      <component name="AlmAlert.dll=binary" long-name="Alm Alert">
-<!--       <unit bldFile="app/organizer/alarmui/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="alarmui" long-name="alarmui">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/organizer/alarmui/group"/>
      </component>
     </collection>
     <collection name="calendarengines" long-name="Calendar Engines" level="engine">
      <component name="agnversit2" long-name="Agenda Versit2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
      </component>
      <component name="calenimp" long-name="Calen Imp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
      </component>
      <component name="caleninterimutils" long-name="Calen Interim Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
      </component>
      <component name="calenlauncher" long-name="Calen Launcher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
      </component>
      <component name="versit2" long-name="Versit 2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/versit2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendarengines" long-name="calendarengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarengines/group"/>
      </component>
     </collection>
     <collection name="calendarui" long-name="Calendar UI" level="ui">
      <component name="aiplugins">
-      <unit bldFile="app/organizer/calendarui/aiplugins/group"/>
      </component>
      <component name="application" long-name="Application">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/messaging/mobilemessaging/unieditor/application/bld"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/application/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="app/messaging/mobilemessaging/unieditor/application/bld"/>
      </component>
      <component name="commonutils" long-name="Common Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/commonutils/group"/>
      </component>
      <component name="controller">
-      <unit bldFile="app/organizer/calendarui/controller/group"/>
      </component>
      <component name="customisation" long-name="Customisation">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/customisation/group"/>
      </component>
      <component name="customisationmanager" long-name="Customisation Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
      </component>
      <component name="editors" long-name=" Editors">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/editors/group"/>
      </component>
      <component name="globaldata" long-name="Global Data">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/globaldata/group"/>
      </component>
      <component name="inc">
-      <unit bldFile="app/organizer/calendarui/inc/group"/>
      </component>
      <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
      </component>
      <component name="notifier" long-name="Notifier">
-      <unit bldFile="app/organizer/calendarui/notifier/group"/>
      </component>
      <component name="regionalplugins" long-name="Regional Plugins">
-      <unit bldFile="app/organizer/calendarui/regionalplugins/group"/>
      </component>
      <component name="server">
-      <unit bldFile="app/organizer/calendarui/server/group"/>
      </component>
      <component name="settings" long-name="Settings">
-      <unit bldFile="app/organizer/calendarui/settings/group"/>
      </component>
      <component name="views" long-name="Views">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/views/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/views/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendarui" long-name="calendarui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Lunar2" long-name="Lunar2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/regionalplugins/Lunar2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Thai" long-name="Thai">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/regionalplugins/Thai/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Vietnamese" long-name="Vietnamese">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/regionalplugins/Vietnamese/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CalenSvr" long-name="CalenSvr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/server/CalenSvr/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CalenSvrClient" long-name="CalenSvrClient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/server/CalenSvrClient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GsPlugin" long-name="GsPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/settings/GsPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingsui" long-name="settingsui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
      </component>
     </collection>
     <collection name="clock2" long-name="Clock2" level="ui">
      <component name="clockengines" long-name="Clock Engines">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/group"/>
      </component>
      <component name="clockui" long-name="Clock UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clocknitzplugin" long-name="clocknitzplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clocknitzplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clockserver" long-name="clockserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clockserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clocktimesourceinterface" long-name="clocktimesourceinterface">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clocktimesourceinterface/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clocktimezoneresolver" long-name="clocktimezoneresolver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/clocktimezoneresolver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clockecomlistener" long-name="clockecomlistener">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockengines/utilities/clockecomlistener/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adtupdater" long-name="adtupdater">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/adtupdater/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarmeditorapp" long-name="alarmeditorapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/alarmeditorapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="datetimeviewplugin" long-name="datetimeviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="countdownengine" long-name="countdownengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/uiengine/countdownengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiengine" long-name="uiengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/uiengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stopwatchengine" long-name="stopwatchengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/uiengine/stopwatchengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uilayer" long-name="uilayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/uilayer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uimodel" long-name="uimodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/clockui/uimodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clock2" long-name="clock2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/clock2/group"/>
      </component>
     </collection>
     <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
      <component name="mrmailboxutils" long-name="MR Mailbox Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meetingrequestengines" long-name="meetingrequestengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingrequestengines/group"/>
      </component>
     </collection>
     <collection name="meetingui" long-name="Meeting UI" level="ui">
      <component name="agnentryui" long-name="Agn Entry UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingui/agnentryui/group"/>
      </component>
      <component name="attendeeview" long-name="Attendee View">
-      <unit bldFile="app/organizer/meetingui/attendeeview/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/organizer/meetingui/attendeeview/Group"/>
      </component>
      <component name="meetingrequestutils" long-name="Meeting Request Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
      </component>
      <component name="meetingrequestviewers" long-name="Meeting Request Viewers">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meetingui" long-name="meetingui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/meetingui/group"/>
      </component>
     </collection>
     <collection name="notepad" long-name="Notepad" level="ui">
      <component name="notepad1" long-name="Notepad1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/notepad/notepad1/group"/>
      </component>
      <component name="txtrecog" long-name="Txt Recog">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/notepad/txtrecog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notepad" long-name="notepad">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/notepad/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SyncMLAdapter" long-name="SyncMLAdapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/notepad/notepad1/SyncMLAdapter/group"/>
      </component>
     </collection>
     <collection name="searchfw" long-name="Search Framework" level="services">
      <component name="coresearchfw" long-name="Core Search Framework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/coresearchfw/group"/>
      </component>
      <component name="plugins">
-      <unit bldFile="app/organizer/searchfw/plugins/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchfw" long-name="searchfw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendarplugin" long-name="calendarplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/calendarplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactsplugin" long-name="contactsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/contactsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filesplugin" long-name="filesplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/filesplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagingplugin" long-name="messagingplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/messagingplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multimediaplugin" long-name="multimediaplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/multimediaplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notessearchplugin" long-name="notessearchplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchfw/plugins/notessearchplugin/group"/>
      </component>
     </collection>
     <collection name="searchui" long-name="Search UI" level="ui">
      <component name="searchapp" long-name="Search App">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchui" long-name="searchui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="indevicesearch" long-name="indevicesearch">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/plugins/indevicesearch/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="resultviewerplugin" long-name="resultviewerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/plugins/resultviewerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchsettingsplugin" long-name="searchsettingsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srchuisettingsplugin" long-name="srchuisettingsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srchaiwprovider" long-name="srchaiwprovider">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/srchaiwprovider/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srchuiapp" long-name="srchuiapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/srchuiapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srchuicommon" long-name="srchuicommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/srchuicommon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srchuigenui" long-name="srchuigenui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/searchui/searchapp/srchuigenui/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="organizer" long-name="organizer">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizer" long-name="organizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="organizer_plat" long-name="organizer_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="agenda_entry_ui_api" long-name="agenda_entry_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="agenda_versit_2_api" long-name="agenda_versit_2_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarm_const_api" long-name="alarm_const_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarm_ui_external_control_api" long-name="alarm_ui_external_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="alarm_ui_secondary_display_api" long-name="alarm_ui_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_exporter_api" long-name="calendar_exporter_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_importer_api" long-name="calendar_importer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_launcher_api" long-name="calendar_launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_settings_keys_api" long-name="calendar_settings_keys_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_tones_settings_keys_api" long-name="calendar_tones_settings_keys_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clock_settings_api" long-name="clock_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="common_alarm_editor_api" long-name="common_alarm_editor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizer_plat" long-name="organizer_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meeting_request_mailbox_utilities_api" long-name="meeting_request_mailbox_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meeting_request_uids_api" long-name="meeting_request_uids_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meeting_request_utillities_api" long-name="meeting_request_utillities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meeting_request_viewer_api" long-name="meeting_request_viewer_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchfw_launcher_api" long-name="searchfw_launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="searchui_launcher_api" long-name="searchui_launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="organizer_pub" long-name="organizer_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="calendar_interim_utils2_api" long-name="calendar_interim_utils2_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizer_pub" long-name="organizer_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notepad_library_api" long-name="notepad_library_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
      </component>
     </collection>
@@ -19240,203 +20206,226 @@
    <block long-name="Messaging Apps" level="apps" name="messaging" levels="1 2">
     <collection name="email" long-name="Email" level="1">
      <component name="imap4mtm" long-name="IMAP4 MTM" plugin="Y" introduced="9.2">
-      <unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
      </component>
      <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" plugin="Y">
-      <unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
      </component>
      <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
      </component>
      <component name="emailnotificationhandler" long-name="Email Notification Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
      </component>
      <component name="imum" long-name="IMUM">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/imum/group"/>
      </component>
      <component name="mail" long-name="Mail">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/mail/group"/>
      </component>
      <component name="syncuimtms" long-name="Sync UI MTMS">
-      <unit bldFile="app/messaging/email/syncuimtms/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/messaging/email/syncuimtms/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DomainApi" long-name="DomainApi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/imum/DomainApi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Mtms" long-name="Mtms">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/imum/Mtms/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Utils" long-name="Utils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/imum/Utils/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="icalviewer" long-name="icalviewer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/email/mail/PluginSrc/icalviewer/group"/>
      </component>
     </collection>
     <collection name="messagingappbase" long-name="Messaging App Base" level="2">
      <component name="obexmtms" long-name="OBEX MTMs" plugin="Y" introduced="7.0s">
-      <unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
      </component>
      <component name="smilparser" long-name="SMIL Parser" introduced="7.0s">
-      <unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
      </component>
      <component name="bium" long-name="Bium">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/bium/group"/>
      </component>
      <component name="mce" long-name="MCE">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/mce/group"/>
      </component>
      <component name="mceextraitems" long-name="Mce Extra Items">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
      </component>
      <component name="mcesettings" long-name="MCE Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
      </component>
      <component name="msgavkon" long-name="Messaging Avkon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
      </component>
      <component name="msgeditor" long-name="Messaging Editor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
      </component>
      <component name="msgerrorwatcher" long-name="Msg Error Watcher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
      </component>
      <component name="ncnlist" long-name="NCN List">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
      </component>
      <component name="schemeplugin" long-name="Scheme Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/contentdownload/ui/schemeplugin/group"/>
      </component>
      <component name="sendui" long-name="Send UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/sendui/group"/>
      </component>
      <component name="smartmessaging" long-name="Smart Messaging">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
      </component>
      <component name="smilengine" long-name="SMIL Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagingappbase" long-name="messagingappbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mcesettingsgsplugin" long-name="mcesettingsgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/mcesettings/mcesettingsgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Initialise" long-name="Initialise">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/Initialise/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msgindicatorplugin" long-name="msgindicatorplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/msgindicatorplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msgnotifiers" long-name="msgnotifiers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/msgnotifiers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="muiu_domain" long-name="muiu_domain">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/muiu_domain/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="muiu_internal" long-name="muiu_internal">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/msgavkon/muiu_internal/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmlinksender" long-name="drmlinksender">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/sendui/drmlinksender/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="genericmtmplugin" long-name="genericmtmplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/sendui/genericmtmplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meetingrequestsender" long-name="meetingrequestsender">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/sendui/meetingrequestsender/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bva" long-name="bva">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/bva/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gmsmodel" long-name="gmsmodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/gmsmodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="icalbc" long-name="icalbc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/icalbc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msgeditorutils" long-name="msgeditorutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/msgeditorutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="oplogobc" long-name="oplogobc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/oplogobc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="richbio" long-name="richbio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/richbio/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ringbc" long-name="ringbc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/ringbc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcalbc" long-name="vcalbc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/vcalbc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcardbc" long-name="vcardbc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/vcardbc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vrec" long-name="vrec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/vrec/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmlbc" long-name="wmlbc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/wmlbc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="transition" long-name="transition">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smilengine/transition/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xhtml" long-name="xhtml">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/messagingappbase/smilengine/xhtml/group"/>
      </component>
     </collection>
@@ -19445,301 +20434,305 @@
       <unit mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings-config.mrp"/>
      </component>
      <component name="mmssettings" long-name="MMS Settings" introduced="9.2">
-      <unit bldFile="app/messaging/mmsengine/mmssettings/group/" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/mmsengine/mmssettings/group/" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
      </component>
      <component name="applicationadapter" long-name="Application Adapter">
-      <unit bldFile="app/messaging/mmsengine/applicationadapter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/>
      </component>
      <component name="clientmtm" long-name="Client MTM">
-      <unit bldFile="app/messaging/mmsengine/clientmtm/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/clientmtm/bld"/>
      </component>
      <component name="genutils" long-name="General Utils">
-      <unit bldFile="app/messaging/mmsengine/genutils/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/genutils/bld"/>
      </component>
      <component name="mmscodec" long-name="MMS Codec">
-      <unit bldFile="app/messaging/mmsengine/mmscodec/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmscodec/bld"/>
      </component>
      <component name="mmscodecclient" long-name="MMS Codec Client">
-      <unit bldFile="app/messaging/mmsengine/mmscodecclient/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/>
      </component>
      <component name="mmsconninit" long-name="MMS Connection Init">
-      <unit bldFile="app/messaging/mmsengine/mmsconninit/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/>
      </component>
      <component name="mmshttptransport" long-name="MMS HTTP Transport">
-      <unit bldFile="app/messaging/mmsengine/mmshttptransport/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmshttptransport/bld"/>
      </component>
      <component name="mmsmessage" long-name="MMS Message">
-      <unit bldFile="app/messaging/mmsengine/mmsmessage/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmsmessage/bld"/>
      </component>
      <component name="mmspushhandler" long-name="MMS Push Handler">
-      <unit bldFile="app/messaging/mmsengine/mmspushhandler/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmspushhandler/bld"/>
      </component>
      <component name="mmsserver" long-name="MMS Server">
-      <unit bldFile="app/messaging/mmsengine/mmsserver/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmsserver/bld"/>
      </component>
      <component name="mmsserversettings" long-name="MMS Server Aettings">
-      <unit bldFile="app/messaging/mmsengine/mmsserversettings/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmsserversettings/bld"/>
      </component>
      <component name="mmswatcher" long-name="MMS Watcher">
-      <unit bldFile="app/messaging/mmsengine/mmswatcher/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/mmswatcher/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsengine" long-name="mmsengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mmsengine/group"/>
      </component>
     </collection>
     <collection name="mobilemessaging" long-name="Mobile Messaging" level="2">
      <component name="smsmtm" long-name="SMS MTM" plugin="Y">
-      <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
      </component>
      <component name="audiomsg" long-name="Audio Message">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
      </component>
      <component name="mmsui" long-name="MMS UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
      </component>
      <component name="msgmedia" long-name="Message Media">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
      </component>
      <component name="postcard" long-name="Postcard">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
      </component>
      <component name="smilui" long-name="SMIL UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
      </component>
      <component name="smsui" long-name="SMS UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
      </component>
      <component name="smum" long-name="Smum">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/smum/group"/>
      </component>
      <component name="unieditor" long-name="Uni Editor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mobilemessaging" long-name="mobilemessaging">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="viewer" long-name="viewer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsplugin" long-name="mmsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/mmsplugin/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="model" long-name="model">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/model/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtm" long-name="mtm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/mtm/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pluginapi" long-name="pluginapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/pluginapi/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="smsplugin" long-name="smsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/smsplugin/bld"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="utils" long-name="utils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/utils/bld"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videocenter/vccommon/utils/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videocenter/vcplayer/utils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoconversionapi" long-name="videoconversionapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/mobilemessaging/unieditor/videoconversionapi/bld"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="messaging" long-name="messaging">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging" long-name="messaging">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="msg_plat" long-name="msg_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="email_domain_utilities_api" long-name="email_domain_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msg_plat" long-name="msg_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="internet_mail_mtm_ui_api" long-name="internet_mail_mtm_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mail_ui_constants_api" long-name="mail_ui_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_center_ui_utilities_api" long-name="messaging_center_ui_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_editor_api" long-name="messaging_editor_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_media_resolver_api" long-name="messaging_media_resolver_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_application_api" long-name="mms_application_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_codec_client_api" long-name="mms_codec_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_conformance_api" long-name="mms_conformance_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_engine_settings_api" long-name="mms_engine_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_server_settings_api" long-name="mms_server_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_contacts_note_secondary_display_api" long-name="new_contacts_note_secondary_display_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_contacts_note_status_api" long-name="new_contacts_note_status_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_contacts_note_variables_api" long-name="new_contacts_note_variables_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_contact_notes_extended_api" long-name="new_contact_notes_extended_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_message_notification_api" long-name="new_message_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="send_ui_meeting_request_api" long-name="send_ui_meeting_request_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="smil_engine_api" long-name="smil_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="smil_player_launch_api" long-name="smil_player_launch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="smil_transition_api" long-name="smil_transition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="unified_editor_video_conversion_api" long-name="unified_editor_video_conversion_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="msg_pub" long-name="msg_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="msg_pub" long-name="msg_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_editor_constants_api" long-name="messaging_editor_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging_integration_api" long-name="messaging_integration_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mms_client_mtm_api" long-name="mms_client_mtm_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="open_new_message_notification_api" long-name="open_new_message_notification_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="plugin_bio_control_api" long-name="plugin_bio_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
      </component>
     </collection>
@@ -19747,111 +20740,124 @@
    <block long-name="Conversation Apps" level="apps" name="conversations" introduced="9.1" levels="utils settings ui">
     <collection name="imstutils" long-name="IM Service Tab Utils" introduced="9.1" level="utils">
      <component name="imconnectionprovider" introduced="9.1" long-name="IM Connection Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
      </component>
      <component name="imconversationview" introduced="9.1" long-name="IM Conversation View">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
      </component>
      <component name="xmppadapter" introduced="9.1" long-name="XMPP Adapter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imstutils" long-name="imstutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imcmslauncherplugin" long-name="imcmslauncherplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconversationview/imcmslauncherplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imcvlauncher" long-name="imcvlauncher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconversationview/imcvlauncher/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imcvuiapp" long-name="imcvuiapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconversationview/imcvuiapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imcvuiengine" long-name="imcvuiengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/imstutils/imconversationview/imcvuiengine/group"/>
      </component>
     </collection>
     <collection name="uiservicetab" long-name="UI Service Tab" introduced="9.1" level="ui">
      <component name="vimpstcmdprocess" introduced="9.1" long-name="VIMP ST Command Process">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
      </component>
      <component name="vimpstdetailsviewplugin" introduced="9.1" long-name="VIMP ST Details View Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
      </component>
      <component name="vimpstengine" introduced="9.1" long-name="VIMP ST Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
      </component>
      <component name="vimpststorage" introduced="9.1" long-name="VIMP ST Storage">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
      </component>
      <component name="vimpstui" introduced="9.1" long-name="VIMP ST UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
      </component>
      <component name="vimpstutils" introduced="9.1" long-name="VIMP ST Utilities">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiservicetab" long-name="uiservicetab">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetab/Group"/>
      </component>
     </collection>
     <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" introduced="9.1" level="settings">
      <component name="vimpstsettings.dll=binary" introduced="9.1">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="uiservicetabsettings" long-name="uiservicetabsettings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/uiservicetabsettings/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="conversations" long-name="conversations">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conversations" long-name="conversations">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="conversations_plat" long-name="conversations_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conversations_plat" long-name="conversations_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/conversations_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_connection_api" long-name="im_connection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_cv_launcher_api" long-name="im_cv_launcher_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="servicewidget" long-name="servicewidget">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="servicewidget" long-name="servicewidget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/servicewidget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="servicewidgetactionhandler" long-name="servicewidgetactionhandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/servicewidget/servicewidgetactionhandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="servicewidgetdatapublisher" long-name="servicewidgetdatapublisher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
      </component>
     </collection>
@@ -19859,201 +20865,240 @@
    <block long-name="Instant Messaging Apps" level="apps" name="im" levels="support engine apps">
     <collection name="impsengine" long-name="IMPS Engine" level="engine">
      <component name="ImpsDataChannel" long-name="Imps Data Channel">
-      <unit bldFile="app/im/impsengine/ImpsDataChannel/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/ImpsDataChannel/group"/>
      </component>
      <component name="ImpsIpCirWatcher" long-name="Imps Ip Cir Watcher">
-      <unit bldFile="app/im/impsengine/ImpsIpCirWatcher/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/ImpsIpCirWatcher/group"/>
      </component>
      <component name="client">
-      <unit bldFile="app/im/impsengine/client/group"/>
      </component>
      <component name="datautils" long-name="Data Utils">
-      <unit bldFile="app/im/impsengine/datautils/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/datautils/group"/>
      </component>
      <component name="engsrv" long-name="Eng Srv">
-      <unit bldFile="app/im/impsengine/engsrv/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/engsrv/group"/>
      </component>
      <component name="imapi" long-name="IM API">
-      <unit bldFile="app/im/impsengine/imapi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/imapi/group"/>
      </component>
      <component name="imlauncher" long-name="IM Launcher">
-      <unit bldFile="app/im/impsengine/imlauncher/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/imlauncher/group"/>
      </component>
      <component name="impswatcher" long-name="Imps Watcher">
-      <unit bldFile="app/im/impsengine/impswatcher/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/impswatcher/Group"/>
      </component>
      <component name="messageencoder" long-name="Message Encoder">
-      <unit bldFile="app/im/impsengine/messageencoder/group"/>
      </component>
      <component name="utils" long-name="Utilities">
-      <unit bldFile="app/im/impsengine/utils/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/utils/group"/>
      </component>
      <component name="wvotaparser" long-name="WV OTA Parser">
-      <unit bldFile="app/im/impsengine/wvotaparser/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/IMPSengine/wvotaparser/group"/>
      </component>
     </collection>
     <collection name="pecengine" long-name="Presence Engine" level="engine">
      <component name="AttributeLibrary2" long-name="Attribute Library 2">
-      <unit bldFile="app/im/pecengine/AttributeLibrary2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/AttributeLibrary2/Group"/>
      </component>
      <component name="CoreUtilsLib2" long-name="Core Utils Lib 2">
-      <unit bldFile="app/im/pecengine/CoreUtilsLib2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/CoreUtilsLib2/Group"/>
      </component>
      <component name="JanitorPlugin2" long-name="Janitor Plugin 2">
-      <unit bldFile="app/im/pecengine/JanitorPlugin2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/JanitorPlugin2/Group"/>
      </component>
      <component name="ListLibrary2" long-name="List Library 2">
-      <unit bldFile="app/im/pecengine/ListLibrary2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/ListLibrary2/Group"/>
      </component>
      <component name="Parser2">
-      <unit bldFile="app/im/pecengine/Parser2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/Parser2/Group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/presadap12/Parser2/Group"/>
      </component>
      <component name="PluginServer2" long-name="Plugin Server 2">
-      <unit bldFile="app/im/pecengine/PluginServer2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/PluginServer2/Group"/>
      </component>
      <component name="PresenceManager2" long-name="Presence Manager 2">
-      <unit bldFile="app/im/pecengine/PresenceManager2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/PresenceManager2/Group"/>
      </component>
      <component name="PresenceServer2" long-name="Presence Server 2">
-      <unit bldFile="app/im/pecengine/PresenceServer2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/PresenceServer2/Group"/>
      </component>
      <component name="StorageManager2" long-name="Storage Manager 2">
-      <unit bldFile="app/im/pecengine/StorageManager2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/StorageManager2/Group"/>
      </component>
      <component name="TransferAdapter2" long-name="Transfer Adapter 2">
-      <unit bldFile="app/im/pecengine/TransferAdapter2/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/PECengine/TransferAdapter2/Group"/>
      </component>
     </collection>
     <collection name="presadap12" long-name="Presence Adap 12" level="support">
      <component name="Parser2">
-      <unit bldFile="app/im/presadap12/Parser2/group"/>
      </component>
      <component name="impsplugin" long-name="IMPS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/presadap12/impsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="presadap12" long-name="presadap12">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/presadap12/group"/>
      </component>
     </collection>
     <collection name="wvsettings20" long-name="WV Settings 20" level="support">
      <component name="WVSAPSettingsStore.dll=binary">
-      <unit bldFile="app/im/wvsettings20/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="wvsettings20" long-name="wvsettings20">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvsettings20/Group"/>
      </component>
     </collection>
     <collection name="wvuing" long-name="WV UI NG" level="apps">
      <component name="IMPSAlwaysOnlinePlugin" long-name="IMPS Always Online Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/IMPSAlwaysOnlinePlugin/group"/>
      </component>
      <component name="IMPSConnectionUI" long-name="IMPS Connection UI">
-      <unit bldFile="app/im/wvuing/IMPSConnectionUI/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/IMPSConnectionUI/Group"/>
      </component>
      <component name="IMPSServiceSettingsUI" long-name="IMPS Service Settings UI">
-      <unit bldFile="app/im/wvuing/IMPSServiceSettingsUI/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/IMPSServiceSettingsUI/Group"/>
      </component>
      <component name="ImLauncher" long-name="IM Launcher">
-      <unit bldFile="app/im/wvuing/ImLauncher/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/ImLauncher/Group"/>
      </component>
      <component name="ImUtils" long-name="Im Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/ImUtils/group"/>
      </component>
      <component name="imindicatorplugin" long-name="IM Indicator Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/imindicatorplugin/group"/>
      </component>
      <component name="wvaudiomanager" long-name="Wv Audio Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/wvaudiomanager/group"/>
      </component>
      <component name="wvcommandutils" long-name="Wv Command Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/wvcommandutils/group"/>
      </component>
      <component name="wvlogger" long-name="Wvlogger">
-      <unit bldFile="app/im/wvuing/wvlogger/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/wvlogger/Group"/>
      </component>
      <component name="wvuiada" long-name="Wvuiada">
-      <unit bldFile="app/im/wvuing/wvuiada/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/wvuiada/Group"/>
      </component>
      <component name="wvuiave" long-name="Wvuiave">
-      <unit bldFile="app/im/wvuing/wvuiave/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/wvuiave/Group"/>
      </component>
      <component name="wvuieng" long-name="Wvuieng">
-      <unit bldFile="app/im/wvuing/wvuieng/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/wvuieng/Group"/>
      </component>
      <component name="wvuipresence" long-name="WV UI Presence">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/wvuipresence/group"/>
      </component>
      <component name="wvuiprocess" long-name="WV UI Process">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/wvuiprocess/group"/>
      </component>
      <component name="wvuistorage" long-name="WV UI Storage">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/wvuistorage/group"/>
      </component>
      <component name="wvvariant" long-name="Wvvariant">
-      <unit bldFile="app/im/wvuing/wvvariant/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/im/wvuing/wvvariant/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wvuing" long-name="wvuing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/wvuing/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="im" long-name="im">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im" long-name="im">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="IMPSengine" long-name="IMPSengine">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IMPSengine" long-name="IMPSengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/IMPSengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wbxml" long-name="wbxml">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/IMPSengine/messageencoder/wbxml/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="PECengine" long-name="PECengine">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PECengine" long-name="PECengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/PECengine/Group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="im_plat" long-name="im_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_plat" long-name="im_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/im_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wv_sap_settings_api" long-name="wv_sap_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="im_pub" long-name="im_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_pub" long-name="im_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/im_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_api" long-name="im_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/im_pub/im_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im_application_launch_api" long-name="im_application_launch_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/im/im_pub/im_application_launch_api/group"/>
      </component>
     </collection>
@@ -20061,25 +21106,27 @@
    <block long-name="Utility Apps" level="apps" name="utils" levels="app">
     <collection name="extras" long-name="Extras" level="app">
      <component name="about" long-name="About">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/extras/about/group"/>
      </component>
      <component name="calcsoft" long-name="Calcsoft">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/extras/calcsoft/group"/>
      </component>
      <component name="converter" long-name="Converter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/extras/converter/group"/>
      </component>
      <component name="chinesedictionary" long-name="Chinese Dictionary">
-      <unit bldFile="app/utils/extras/chinesedictionary/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aboutgsplugin" long-name="aboutgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/extras/about/aboutgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="extras" long-name="extras">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/utils/extras/group"/>
      </component>
     </collection>
@@ -20087,30 +21134,33 @@
    <block long-name="Dictionary" level="services" name="dictionary" levels="appl">
     <collection name="userdict" long-name="User Dictionary" level="appl">
      <component name="UserDict.exe=binary" long-name="UserDict Server">
-      <unit bldFile="app/dictionary/userdict/group"/>
      </component>
      <component name="UserDict.dll=binary" long-name="UserDict Client">
-<!--       <unit bldFile="app/dictionary/userdict/group"/> -->
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="userdict" long-name="userdict">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/dictionary/userdict/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="dictionary" long-name="dictionary">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dictionary" long-name="dictionary">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/dictionary/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="dictionary_plat" long-name="dictionary_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dictionary_plat" long-name="dictionary_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/dictionary/dictionary_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="menu_suites_macros_api" long-name="menu_suites_macros_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
      </component>
     </collection>
@@ -20118,50 +21168,52 @@
    <block long-name="Camera Apps" level="apps" name="camera" levels="empty 1">
     <collection name="camerauis" long-name="Camera UIs" level="1">
      <component name="activepalette" long-name="Active Palette">
-      <unit bldFile="app/camera/camerauis/activepalette/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/camera/camerauis/activepalette/Group"/>
      </component>
      <component name="cameraapp" long-name="Camera Application">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camerauis/cameraapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camerauiconfigmanager" long-name="camerauiconfigmanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GsCamcorderPlugin" long-name="GsCamcorderPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camerauis/cameraapp/generic/GsCamcorderPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camerauis" long-name="camerauis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camerauis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="camera" long-name="camera">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camera" long-name="camera">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="camera_plat" long-name="camera_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="active_palette_2_api" long-name="active_palette_2_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camcorder_ui_constants_api" long-name="camcorder_ui_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camera_plat" long-name="camera_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/camera/camera_plat/group"/>
      </component>
     </collection>
@@ -20169,280 +21221,289 @@
    <block long-name="Image Editor Apps" level="apps" name="imgeditor" levels="engine ui">
     <collection name="imageeditor" long-name="Image Editor" level="ui">
      <component name="EditorProvider" long-name="Editor Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/EditorProvider/group"/>
      </component>
      <component name="IEPB">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/IEPB/group"/>
      </component>
      <component name="ImageEditorManager" long-name="Image Editor Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/ImageEditorManager/group"/>
      </component>
      <component name="ImageEditorUI" long-name="Image Editor UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/ImageEditorUI/group"/>
      </component>
      <component name="PB">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/PB/group"/>
      </component>
      <component name="imageeditorApp" long-name="Image Editor App">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/imageeditorApp/group"/>
      </component>
      <component name="plugins">
-      <unit bldFile="app/imgeditor/imageeditor/plugins/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageeditor" long-name="imageeditor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BlackWhitePlugin" long-name="BlackWhitePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/BlackWhitePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BrightnessPlugin" long-name="BrightnessPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/BrightnessPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BubblePlugin" long-name="BubblePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/BubblePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CartoonizePlugin" long-name="CartoonizePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/CartoonizePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ClipartPlugin" long-name="ClipartPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/ClipartPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ContrastPlugin" long-name="ContrastPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/ContrastPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CropPlugin" long-name="CropPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/CropPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="DrawPlugin" long-name="DrawPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/DrawPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FramePlugin" long-name="FramePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/FramePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="NegativePlugin" long-name="NegativePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/NegativePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RedEyePlugin" long-name="RedEyePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/RedEyePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ResizePlugin" long-name="ResizePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/ResizePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RotateLPlugin" long-name="RotateLPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/RotateLPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="RotateRPlugin" long-name="RotateRPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/RotateRPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SepiaPlugin" long-name="SepiaPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/SepiaPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SharpnessPlugin" long-name="SharpnessPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/SharpnessPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TextPlugin" long-name="TextPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditor/plugins/TextPlugin/group"/>
      </component>
     </collection>
     <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
      <component name="EngineWrapper" long-name="Engine Wrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/EngineWrapper/group"/>
      </component>
      <component name="ImageEditorUtils" long-name="Image Editor Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/ImageEditorUtils/group"/>
      </component>
      <component name="JpegRotator" long-name="Jpeg Rotator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/JpegRotator/group"/>
      </component>
      <component name="JpegScaler" long-name="Jpeg Scaler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/JpegScaler/group"/>
      </component>
      <component name="SystemParameters" long-name="System Parameters">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/SystemParameters/group"/>
      </component>
      <component name="filters" long-name="Filters">
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterBrightness" long-name="FilterBrightness">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterBrightness/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterBubble" long-name="FilterBubble">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterBubble/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterBuffer" long-name="FilterBuffer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterBuffer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterCartoon" long-name="FilterCartoon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterCartoon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterClipart" long-name="FilterClipart">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterClipart/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterContrast" long-name="FilterContrast">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterContrast/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterCrop" long-name="FilterCrop">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterCrop/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterDraw" long-name="FilterDraw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterDraw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterFrame" long-name="FilterFrame">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterFrame/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterGrayScale" long-name="FilterGrayScale">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterGrayScale/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterIclSource" long-name="FilterIclSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterIclSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterJpegSource" long-name="FilterJpegSource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterJpegSource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterJpegTarget" long-name="FilterJpegTarget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterJpegTarget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterNegate" long-name="FilterNegate">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterNegate/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterRedEye" long-name="FilterRedEye">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterRedEye/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterRotate" long-name="FilterRotate">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterRotate/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterScale" long-name="FilterScale">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterScale/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterSepia" long-name="FilterSepia">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterSepia/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterSharpness" long-name="FilterSharpness">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterSharpness/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FilterText" long-name="FilterText">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/filters/FilterText/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageeditorengine" long-name="imageeditorengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imageeditorengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imgeditor" long-name="imgeditor">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgeditor" long-name="imgeditor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imgeditor_plat" long-name="imgeditor_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgeditor_plat" long-name="imgeditor_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_editor_debug_utilities_api" long-name="image_editor_debug_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_editor_definitions_api" long-name="image_editor_definitions_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_editor_system_parameters_api" long-name="image_editor_system_parameters_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_editor_utilities_api" long-name="image_editor_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="image_processing_engine_api" long-name="image_processing_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
      </component>
     </collection>
@@ -20450,75 +21511,88 @@
    <block long-name="Video Editor Apps" level="apps" name="videoeditor" levels="engine ui">
     <collection name="videditor" long-name="Video Editor" level="ui">
      <component name="ManualVideoEditor" long-name="Manual Video Editor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/ManualVideoEditor/group"/>
      </component>
      <component name="SimpleCutVideo" long-name="Simple Cut Video">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/SimpleCutVideo/group"/>
      </component>
      <component name="SimpleVideoEditor" long-name="Simple Video Editor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/SimpleVideoEditor/group"/>
      </component>
      <component name="TrimForMms" long-name="Trim For MMS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/TrimForMms/group"/>
      </component>
      <component name="VideoEditorCommon" long-name="Video Editor Common">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/VideoEditorCommon/group"/>
      </component>
      <component name="VideoEditorUiComponents" long-name="Video Editor UI Components">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/VideoEditorUiComponents/group"/>
      </component>
      <component name="VideoProvider" long-name="Video Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/VideoProvider/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videditor" long-name="videditor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videditor/group"/>
      </component>
     </collection>
     <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
      <component name="audioeditorengine" long-name="Audio Editor Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
      </component>
      <component name="avcedit" long-name="Avcedit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
      </component>
      <component name="h263decoder" long-name="H263 Decoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
      </component>
      <component name="mp3aacManipLib" long-name="Mp3aac Manip Lib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/mp3aacManipLib/group"/>
      </component>
      <component name="vedengine" long-name="Ved Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
      </component>
      <component name="vedtranscoder" long-name="Ved Transcoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoeditorengine" long-name="videoeditorengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditorengine/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoeditor" long-name="videoeditor">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoeditor" long-name="videoeditor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoeditor_plat" long-name="videoeditor_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoeditor_plat" long-name="videoeditor_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="video_editor_engine_api" long-name="video_editor_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
      </component>
     </collection>
@@ -20526,64 +21600,68 @@
    <block long-name="Gallery Apps" level="apps" name="gallery" levels="app">
     <collection name="mediagallery" long-name="Media Gallery" level="app">
      <component name="MediaGallery2" long-name="Media Gallery 2">
-      <unit bldFile="app/gallery/mediagallery/MediaGallery2/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mediagallery" long-name="mediagallery">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/mediagallery/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cmgxexternalmusicviewcontainer" long-name="t_cmgxexternalmusicviewcontainer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/mediagallery/mediagallery2/ExtensionPlugins/musicviewplugin/Test/t_cmgxexternalmusicviewcontainer"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cmgxexternalmusicviewplugin" long-name="t_cmgxexternalmusicviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/mediagallery/mediagallery2/ExtensionPlugins/musicviewplugin/Test/t_cmgxexternalmusicviewplugin"/>
      </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mediagallery2" long-name="mediagallery2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/gallery/mediagallery/mediagallery2/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="gallery" long-name="gallery">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gallery" long-name="gallery">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/gallery/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="gallery_plat" long-name="gallery_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="album_manager_api" long-name="album_manager_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/album_manager_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gallery_plat" long-name="gallery_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_file_api" long-name="media_file_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/media_file_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_gallery_api" long-name="media_gallery_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/media_gallery_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_gallery_file_notification" long-name="media_gallery_file_notification">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/media_gallery_file_notification/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_gallery_main_view_extension_api" long-name="media_gallery_main_view_extension_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/gallery/gallery_plat/media_gallery_main_view_extension_api/group"/>
      </component>
     </collection>
@@ -20591,60 +21669,66 @@
    <block long-name="Video Player Apps" level="apps" name="videoplayer" levels="support apps">
     <collection name="lwplayer" long-name="LW Player" level="apps">
      <component name="LWPlayer.exe=binary" long-name="LW Player">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="lwplayer" long-name="lwplayer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoplayer/lwplayer/group"/>
      </component>
     </collection>
     <collection name="mediaplayer" long-name="Media Player" level="apps">
      <component name="MPEngine.dll=binary" long-name="MP Engine">
-      <unit bldFile="app/videoplayer/mediaplayer/group"/>
      </component>
      <component name="MPFileDetailsDialog.dll=binary">
-<!--       <unit bldFile="app/videoplayer/mediaplayer/group"/> -->
      </component>
      <component name="MPRecognizer.dll=binary">
-<!--       <unit bldFile="app/videoplayer/mediaplayer/group"/> -->
      </component>
      <component name="MediaPlayer.exe=binary">
-<!--       <unit bldFile="app/videoplayer/mediaplayer/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mediaplayer" long-name="mediaplayer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videoplayer/mediaplayer/group"/>
      </component>
     </collection>
     <collection name="mediasettings" long-name="Media Settings" level="support">
      <component name="GSVideoPlugin.dll=binary">
-      <unit bldFile="app/videoplayer/mediasettings/group"/>
      </component>
      <component name="MPSettBase.dll=binary">
-<!--       <unit bldFile="app/videoplayer/mediasettings/group"/> -->
      </component>
      <component name="MPSettROPModel.dll=binary">
-<!--       <unit bldFile="app/videoplayer/mediasettings/group"/> -->
      </component>
      <component name="MediaSettings.exe=binary">
-<!--       <unit bldFile="app/videoplayer/mediasettings/group"/> -->
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mediasettings" long-name="mediasettings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/videoplayer/mediasettings/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoplayer" long-name="videoplayer">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoplayer" long-name="videoplayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoplayer/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videoplayer_plat" long-name="videoplayer_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoplayer_plat" long-name="videoplayer_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_player_engine_api" long-name="media_player_engine_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="media_player_file_details_dialog_api" long-name="media_player_file_details_dialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/group"/>
      </component>
     </collection>
@@ -20652,427 +21736,397 @@
    <block long-name="Photos" level="apps" name="photos" levels="support fw ui app">
     <collection name="activedataplugin" long-name="Active Data Plugin" level="fw">
      <component name="glxactivedataplugin.dll=binary">
-      <unit bldFile="app/photos/activedataplugin/group"/>
      </component>
      <component name="test" long-name="Test">
-      <unit bldFile="app/photos/activedataplugin/test/group"/>
      </component>
     </collection>
     <collection name="collectionframework" long-name="Collection Framework" level="fw">
      <component name="datasource" long-name="Data Source">
-      <unit bldFile="app/photos/collectionframework/datasource/group"/>
      </component>
      <component name="plugins">
-      <unit bldFile="app/photos/collectionframework/plugins/group"/>
      </component>
      <component name="test">
-      <unit bldFile="app/photos/collectionframework/test/group"/>
      </component>
      <component name="thumbnailcreator" long-name="Thumbnail Creator">
-      <unit bldFile="app/photos/collectionframework/thumbnailcreator/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/thumbnailcreator/group"/>
      </component>
     </collection>
     <collection name="common" long-name="Common" level="support">
      <component name="glxcommon.dll=binary">
-      <unit bldFile="app/photos/common/group"/>
      </component>
      <component name="test">
-      <unit bldFile="app/photos/common/test/group"/>
      </component>
     </collection>
     <collection name="commonui" long-name="Common UI" level="ui">
      <component name="glxcommonui.dll=binary">
-      <unit bldFile="app/photos/commonui/group"/>
      </component>
      <component name="test">
-      <unit bldFile="app/photos/commonui/test/group"/>
      </component>
     </collection>
     <collection name="contentharvesterplugin" long-name="Content Harvester Plugin" level="ui">
      <component name="glxcontentharvesterplugin.dll=binary">
-      <unit bldFile="app/photos/contentharvesterplugin/group"/>
      </component>
     </collection>
     <collection name="controllers" long-name="Controllers" level="ui">
      <component name="collectionmanager" long-name="Collection Manager">
-      <unit bldFile="app/photos/controllers/collectionmanager/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/collectionmanager/group"/>
      </component>
      <component name="fetcher" long-name="Fetcher">
-      <unit bldFile="app/photos/controllers/fetcher/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/fetcher/group"/>
      </component>
     </collection>
     <collection name="gallery" long-name="Gallery" level="app">
      <component name="glx.exe=binary">
-      <unit bldFile="app/photos/gallery/group"/>
      </component>
     </collection>
     <collection name="logging" long-name="Logging" level="support">
      <component name="app">
-      <unit bldFile="app/photos/logging/app/group"/>
      </component>
      <component name="client">
-      <unit bldFile="app/photos/logging/client/group"/>
      </component>
     </collection>
     <collection name="photossuite" long-name="Photos Suite" level="ui">
      <component name="dummyC.dll=binary">
-      <unit bldFile="app/photos/photossuite/group"/>
      </component>
     </collection>
     <collection name="slideshow" long-name="Slideshow" level="app">
      <component name="engine">
-      <unit bldFile="app/photos/slideshow/engine/group"/>
      </component>
      <component name="settingsdialog" long-name="Settings Dialog">
-      <unit bldFile="app/photos/slideshow/settingsdialog/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/slideshow/settingsdialog/group"/>
      </component>
      <component name="view" long-name="View">
-      <unit bldFile="app/photos/slideshow/view/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/view/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/slideshow/view/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/contentdownload/ui/view/group"/>
      </component>
     </collection>
     <collection name="test" long-name="Test" level="app">
      <component name="viewframework">
-      <unit bldFile="app/photos/test/viewframework/group"/>
      </component>
     </collection>
     <collection name="viewframework" long-name="View Framework" level="fw">
      <component name="commandhandlers" long-name="Command Handlers">
-      <unit bldFile="app/photos/viewframework/commandhandlers/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/group"/>
      </component>
      <component name="dataprovider" long-name="Data Provider">
-      <unit bldFile="app/photos/viewframework/dataprovider/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/dataprovider/group"/>
      </component>
      <component name="drmutility">
-      <unit bldFile="app/photos/viewframework/drmutility/group"/>
      </component>
      <component name="layouts" long-name="Layouts">
-      <unit bldFile="app/photos/viewframework/layouts/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/layouts/group"/>
      </component>
      <component name="medialists" long-name="Media Lists">
-      <unit bldFile="app/photos/viewframework/medialists/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/dataprovider/test/medialists/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/medialists/group"/>
      </component>
      <component name="plugins">
-      <unit bldFile="app/photos/viewframework/plugins/group"/>
      </component>
      <component name="texturemanager" long-name="Texture Manager">
-      <unit bldFile="app/photos/viewframework/texturemanager/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/texturemanager/group"/>
      </component>
      <component name="tvout" long-name="TV Out">
-      <unit bldFile="app/photos/viewframework/tvout/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/tvout/group"/>
      </component>
      <component name="uiutilities" long-name="UI Utilities">
-      <unit bldFile="app/photos/viewframework/uiutilities/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/uiutilities/group"/>
      </component>
      <component name="views">
-      <unit bldFile="app/photos/viewframework/views/group"/>
      </component>
      <component name="visuallistmanager" long-name="Visuallist Manager">
-      <unit bldFile="app/photos/viewframework/visuallistmanager/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/visuallistmanager/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="photos" long-name="photos">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="photos" long-name="photos">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="photos_plat" long-name="photos_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collection_plugins_api" long-name="collection_plugins_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="controllers_collection_api" long-name="controllers_collection_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gallery_utilities_api" long-name="gallery_utilities_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="photos_plat" long-name="photos_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="slideshow_ui_constants_api" long-name="slideshow_ui_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="views_metadatadialog_api" long-name="views_metadatadialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="photosgallery" long-name="photosgallery">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glxdatasourcemde" long-name="glxdatasourcemde">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/datasource/plugins/glxdatasourcemde/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glxdatasourcemde2.5" long-name="glxdatasourcemde2.5">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/datasource/plugins/glxdatasourcemde2.5/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="glxcollectionpluginalbums" long-name="glxcollectionpluginalbums">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tagcollectionplugin" long-name="tagcollectionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/tagcollectionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="albumcollectionplugin" long-name="albumcollectionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/Test/albumcollectionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="testtagcollectionplugin" long-name="testtagcollectionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/plugins/Test/testtagcollectionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gallerytestapp" long-name="gallerytestapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/collectionframework/test/gallerytestapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_glxresolutionutilitiy" long-name="t_glxresolutionutilitiy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/commonui/test/t_glxresolutionutilitiy"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentharvesterplugin" long-name="contentharvesterplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/contentharvesterplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fetchertestapp" long-name="fetchertestapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/fetcher/Test/fetchertestapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ut_fetcher" long-name="ut_fetcher">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/fetcher/Test/ut_fetcher"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="controllers" long-name="controllers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/controllers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="photosgallery" long-name="photosgallery">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="icons" long-name="icons">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/icons"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/utils/icons/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="logging" long-name="logging">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/logging/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="photossuite" long-name="photossuite">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/photossuite/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="slideshow" long-name="slideshow">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/slideshow/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="albumpopuptest" long-name="albumpopuptest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/test/viewframework/uiutilities/albumpopuptest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commandhandlerbase" long-name="commandhandlerbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commandhandlerdrm" long-name="commandhandlerdrm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerdrm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commandhandlermarking" long-name="commandhandlermarking">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlermarking/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commandhandlermoreinfo" long-name="commandhandlermoreinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlermoreinfo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commandhandlerupnp" long-name="commandhandlerupnp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxcommandhandlershowviaupnp" long-name="t_cglxcommandhandlershowviaupnp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/test/t_cglxcommandhandlershowviaupnp"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxthumbnailsaver" long-name="t_cglxthumbnailsaver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/test/t_cglxthumbnailsaver"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxupnprendererimpl" long-name="t_cglxupnprendererimpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/test/t_cglxupnprendererimpl"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_glxcommandhandlercopytohomenetwork" long-name="t_glxcommandhandlercopytohomenetwork">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/test/t_glxcommandhandlercopytohomenetwork"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_glxupnprenderer" long-name="t_glxupnprenderer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/test/t_glxupnprenderer"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commoncommandhandlers" long-name="commoncommandhandlers">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxaiwservicehandler" long-name="t_cglxaiwservicehandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/test/t_cglxaiwservicehandler"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_glxcommandhandlerback" long-name="t_glxcommandhandlerback">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/test/t_glxcommandhandlerback"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ut_cglxcommandhandlersortorder" long-name="ut_cglxcommandhandlersortorder">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/test/ut_cglxcommandhandlersortorder"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ut_commandhandlermoreinfo" long-name="ut_commandhandlermoreinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/test/ut_commandhandlermoreinfo"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ut__commandhandlermarking" long-name="ut__commandhandlermarking">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/test/ut__commandhandlermarking"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui_commandbinding" long-name="ui_commandbinding">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/dataprovider/test/ui_commandbinding/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxdownloadsgridviewplugin" long-name="t_cglxdownloadsgridviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/gridviewplugin/test/t_cglxdownloadsgridviewplugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ut_CGlxTagGridViewPlugin" long-name="ut_CGlxTagGridViewPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/gridviewplugin/test/ut_CGlxTagGridViewPlugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tagsbrowserviewplugin" long-name="tagsbrowserviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/tagsbrowserviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxtagsbrowserviewplugin" long-name="t_cglxtagsbrowserviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/tagsbrowserviewplugin/test/t_cglxtagsbrowserviewplugin"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="testgridviewplugin" long-name="testgridviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/plugins/test/testgridviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_cglxhuiutility" long-name="t_cglxhuiutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/uiutilities/Test/t_cglxhuiutility"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="t_glxskinchangemonitor" long-name="t_glxskinchangemonitor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/uiutilities/Test/t_glxskinchangemonitor"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cloudview" long-name="cloudview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/views/cloudview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="listview" long-name="listview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/views/listview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadatadialog" long-name="metadatadialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/views/metadatadialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="viewbase" long-name="viewbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/photos/photosgallery/viewframework/views/viewbase/group"/>
      </component>
     </collection>
@@ -21080,296 +22134,307 @@
    <block long-name="Video Center" level="apps" name="videocenter" levels="eng ui app">
     <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
      <component name="mpx_common_api" long-name="MPX Common_Api">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/>
      </component>
      <component name="vcxmyvideoscollectionplugin.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mpxmyvideoscollection" long-name="mpxmyvideoscollection">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/mpxmyvideoscollection/group"/>
      </component>
     </collection>
     <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
      <component name="nsmyvideos" long-name="NS Myvideos">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/>
      </component>
      <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nsmyvideosview" long-name="nsmyvideosview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/nsmyvideosview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hgmyvideos" long-name="hgmyvideos">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideos/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hgmyvideosplugin" long-name="hgmyvideosplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideosplugin/group"/>
      </component>
     </collection>
     <collection name="vccommon" long-name="Video Center Common" level="eng">
      <component name="help_rel6" long-name="Help REl6">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/help_rel6/group"/>
      </component>
      <component name="notifierplugins" long-name="Notifier Plugins">
-      <unit bldFile="app/videocenter/vccommon/notifierplugins/group"/>
      </component>
      <component name="utils">
-      <unit bldFile="app/videocenter/vccommon/utils/group"/>
      </component>
      <component name="viewmessageutility" long-name="View Message Utility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/viewmessageutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vccommon" long-name="vccommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="notifierplugin" long-name="notifierplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/notifierplugins/notifierplugin/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcxnotifier" long-name="vcxnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/notifierplugins/vcxnotifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sis" long-name="sis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vccommon/sis"/>
      </component>
     </collection>
     <collection name="vcengines" long-name="Video Center Engines" level="eng">
      <component name="livetvepgengine" long-name="Live TV EPG Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/livetvepgengine/group"/>
      </component>
      <component name="livetvschedulerplugin" long-name="Live TV Scheduler Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/livetvschedulerplugin/group"/>
      </component>
      <component name="livetvutils" long-name="Live TV Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/livetvutils/group"/>
      </component>
      <component name="mrssplugin" long-name="Mrss Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/mrssplugin/group"/>
      </component>
      <component name="networkengine" long-name="Network Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/networkengine/group"/>
      </component>
      <component name="scheduleddlplugin" long-name="Scheduled Download Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/scheduleddlplugin/group"/>
      </component>
      <component name="server">
-      <unit bldFile="app/videocenter/vcengines/server/group"/>
      </component>
      <component name="serviceprovisioning" long-name="Service Provisioning">
-      <unit bldFile="app/videocenter/vcengines/serviceprovisioning/group"/>
      </component>
      <component name="tunerengine" long-name="Tuner Engine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/tunerengine/group"/>
      </component>
      <component name="voddownloadplugin" long-name="VOD Download Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/voddownloadplugin/group"/>
      </component>
      <component name="xmltvplugin" long-name="XML TV Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/xmltvplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcengines" long-name="vcengines">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clientapi" long-name="clientapi">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/server/clientapi/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="IptvEpgManager" long-name="IptvEpgManager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/server/IptvEpgManager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omaprovisioning" long-name="omaprovisioning">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/omaprovisioning/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioningappui" long-name="provisioningappui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningappui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioningprocessor" long-name="provisioningprocessor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningprocessor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="provisioningrecognizer" long-name="provisioningrecognizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningrecognizer/group"/>
      </component>
     </collection>
     <collection name="vcnsuis" long-name="Video Center NS UIs" level="ui">
      <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsahplugin/group"/>
      </component>
      <component name="vcnsapp" long-name="VCNS App">
-      <unit bldFile="app/videocenter/vcnsuis/vcnsapp/group"/>
      </component>
      <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnschplugin/group"/>
      </component>
      <component name="vcnslivetv" long-name="VCNS Live TV">
-      <unit bldFile="app/videocenter/vcnsuis/vcnslivetv/group"/>
      </component>
      <component name="vcnssettings" long-name="VCNS Settings">
-      <unit bldFile="app/videocenter/vcnsuis/vcnssettings/group"/>
      </component>
      <component name="vcnsvodui" long-name="VCNS VOD UI">
-      <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsappui" long-name="vcnsappui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsappui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsbsutility" long-name="vcnsbsutility">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsbsutility/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsuiengine" long-name="vcnsuiengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsuiengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remindernotifier" long-name="remindernotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnslivetv/remindernotifier/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsgsplugin" long-name="vcnsgsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsgsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsscheduleplugin" long-name="vcnsscheduleplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsscheduleplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsscheduleview" long-name="vcnsscheduleview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsscheduleview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnssettingsengine" long-name="vcnssettingsengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnssettingsengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnssettingsplugin" long-name="vcnssettingsplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnssettingsplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnssettingsviews" long-name="vcnssettingsviews">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnssettingsviews/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hgvodplugin" long-name="hgvodplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/hgvodplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcnsvodplugin" long-name="vcnsvodplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hgvodui" long-name="hgvodui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/hgvodui/group"/>
      </component>
     </collection>
     <collection name="vcplayer" long-name="Video Center Player" level="app">
      <component name="core">
-      <unit bldFile="app/videocenter/vcplayer/core/group"/>
      </component>
      <component name="defaultview" long-name="Default View">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/defaultview/group"/>
      </component>
      <component name="plugins">
-      <unit bldFile="app/videocenter/vcplayer/plugins/group"/>
      </component>
      <component name="utils">
-      <unit bldFile="app/videocenter/vcplayer/utils/group"/>
      </component>
      <component name="vcnsplayerview" long-name="VCNS Player View">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/vcnsplayerview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="controllerbase" long-name="controllerbase">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/core/controllerbase/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playercore" long-name="playercore">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/core/playercore/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcplayer" long-name="vcplayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dlprogresscontroller" long-name="dlprogresscontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/plugins/dlprogresscontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rtpfileplaycontroller" long-name="rtpfileplaycontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/plugins/rtpfileplaycontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="unicaststreamplayercontroller" long-name="unicaststreamplayercontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/plugins/unicaststreamplayercontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60_50" long-name="s60_50">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/vcplayer/utils/icons/s60_50/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videocenter" long-name="videocenter">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videocenter" long-name="videocenter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="videocenter_plat" long-name="videocenter_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videocenter_plat" long-name="videocenter_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/videocenter_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videocenter_player_api" long-name="videocenter_player_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/videocenter/videocenter_plat/videocenter_player_api/group"/>
      </component>
     </collection>
@@ -21377,457 +22442,457 @@
    <block long-name="Music Player Apps" level="apps" name="musicplayer" levels="plugins support apps">
     <collection name="cameseui" long-name="Camese UI" level="support">
      <component name="browserview" long-name="Browser View">
-      <unit bldFile="app/musicplayer/cameseui/browserview/group"/>
      </component>
      <component name="browserviewplugin" long-name="Browser View Plugin">
-      <unit bldFile="app/musicplayer/cameseui/browserviewplugin/group"/>
      </component>
      <component name="common">
-      <unit bldFile="app/musicplayer/cameseui/common/group"/>
      </component>
      <component name="drmhandler" long-name="DRM Handler">
-      <unit bldFile="app/musicplayer/cameseui/drmhandler/group"/>
      </component>
     </collection>
     <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
      <component name="activeidle" long-name="Active Idle">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/>
      </component>
      <component name="app">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
      </component>
      <component name="commonui">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
      </component>
      <component name="mediakeyhandler" long-name="Mediakey Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
      </component>
      <component name="metadatahandler" long-name="Metadata Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
      </component>
      <component name="mpvolumepopup" long-name="MP Volume PopUp">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/mpvolumepopup/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiplayerplugin" long-name="aiplayerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/aiplayerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxmusicplayer" long-name="mpxmusicplayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
      </component>
     </collection>
     <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
      <component name="data">
-      <unit bldFile="app/musicplayer/musichomescreen/data/group"/>
      </component>
      <component name="dummyMusic.dll=binary">
-      <unit bldFile="app/musicplayer/musichomescreen/group"/>
      </component>
      <component name="mcpmusicplayer" long-name="MCP Music Player">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/mcpmusicplayer/group"/>
      </component>
      <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/>
      </component>
      <component name="musiccontentpublisher" long-name="Music Content Publisher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/musiccontentpublisher/group"/>
      </component>
      <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="default" long-name="default">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/data/themes/default/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="musicwidget" long-name="musicwidget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musichomescreen/data/themes/default/install/musicwidget/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="musichomescreen" long-name="musichomescreen">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/musicplayer/musichomescreen/group"/>
+     </component>
     </collection>
     <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
      <component name="MusicVisualizationPlugin.dll=binary">
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="musicvisualization" long-name="musicvisualization">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicvisualization/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxvisualizationplugins" long-name="mpxvisualizationplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="musicvisualizationplugin" long-name="musicvisualizationplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicvisualization/musicvisualizationplugin/group"/>
      </component>
     </collection>
     <collection name="serviceplugins" long-name="Service Plugins" level="plugins">
      <component name="collectionplugins" long-name="Collection Plugins">
-      <unit bldFile="app/musicplayer/serviceplugins/collectionplugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/collectionplugins/group"/>
      </component>
      <component name="playbackplugins" long-name="Playback Plugins">
-      <unit bldFile="app/musicplayer/serviceplugins/playbackplugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playbackplugins/group"/>
      </component>
      <component name="playlistplugins" long-name="Playlist Plugins">
-      <unit bldFile="app/musicplayer/serviceplugins/playlistplugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playlistplugins/group"/>
      </component>
      <component name="screensaverplugins" long-name="Screensaver Plugins">
-      <unit bldFile="app/musicplayer/serviceplugins/screensaverplugins/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/screensaverplugins/group"/>
      </component>
      <component name="visualizationplugins" long-name="Visualization Plugins">
-      <unit bldFile="app/musicplayer/serviceplugins/visualizationplugins/group"/>
      </component>
     </collection>
     <collection name="viewplugins" long-name="View Plugins" level="plugins">
      <component name="plugins">
-      <unit bldFile="app/musicplayer/viewplugins/plugins/group"/>
      </component>
      <component name="views">
-      <unit bldFile="app/musicplayer/viewplugins/views/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="musicplayer" long-name="musicplayer">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="musicplayer" long-name="musicplayer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mpxplugins" long-name="mpxplugins">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxplugins" long-name="mpxplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxinmemoryplugin" long-name="mpxinmemoryplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/collectionplugins/mpxinmemoryplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxsqlitedbcommon" long-name="mpxsqlitedbcommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbcommon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxsqlitedbplugin" long-name="mpxsqlitedbplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxsqlitepodcastdbplugin" long-name="mpxsqlitepodcastdbplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/collectionplugins/mpxsqlitepodcastdbplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceplugins" long-name="serviceplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioeffects" long-name="audioeffects">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playbackplugins/audioeffects/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="localaudio" long-name="localaudio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playbackplugins/localaudio/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="progressdownload" long-name="progressdownload">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playbackplugins/progressdownload/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="progressdownloadsb" long-name="progressdownloadsb">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playbackplugins/progressdownloadsb/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="m3uplaylistplugin" long-name="m3uplaylistplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/playlistplugins/m3uplaylistplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpxscreensaverplugin" long-name="mpxscreensaverplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/screensaverplugins/mpxscreensaverplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="viewplugins" long-name="viewplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="addtracksdialogplugin" long-name="addtracksdialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/addtracksdialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="albumarteditordialogplugin" long-name="albumarteditordialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/albumarteditordialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioeffectsviewplugin" long-name="audioeffectsviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/audioeffectsviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionviewplugin" long-name="collectionviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/collectionviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="embeddedplaybackviewplugin" long-name="embeddedplaybackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/embeddedplaybackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="equalizerviewplugin" long-name="equalizerviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/equalizerviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mainviewplugin" long-name="mainviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/mainviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadataeditordialogplugin" long-name="metadataeditordialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/metadataeditordialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdplaybackviewplugin" long-name="pdplaybackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/pdplaybackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdsbplaybackviewplugin" long-name="pdsbplaybackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/pdsbplaybackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playbackviewplugin" long-name="playbackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/playbackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="podcastplaybackviewplugin" long-name="podcastplaybackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/podcastplaybackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="podcastviewplugin" long-name="podcastviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/podcastviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowsedialogplugin" long-name="upnpbrowsedialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/upnpbrowsedialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpplaybackdialogplugin" long-name="upnpplaybackdialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/upnpplaybackdialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpplaybackviewplugin" long-name="upnpplaybackviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/upnpplaybackviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="visualizationmenudialogplugin" long-name="visualizationmenudialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/visualizationmenudialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="visualizationviewplugin" long-name="visualizationviewplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/visualizationviewplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="waitnotedialogplugin" long-name="waitnotedialogplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/plugins/waitnotedialogplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="addtracksdialog" long-name="addtracksdialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/addtracksdialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="albumarteditordialog" long-name="albumarteditordialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/albumarteditordialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioeffectsview" long-name="audioeffectsview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/audioeffectsview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="collectionview" long-name="collectionview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/collectionview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commoncontainer" long-name="commoncontainer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/commoncontainer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonplaybackview" long-name="commonplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/commonplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="embeddedplaybackview" long-name="embeddedplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/embeddedplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="equalizerview" long-name="equalizerview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/equalizerview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mainview" long-name="mainview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/mainview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadataeditordialog" long-name="metadataeditordialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/metadataeditordialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdplaybackview" long-name="pdplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/pdplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pdsbplaybackview" long-name="pdsbplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/pdsbplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="playbackview" long-name="playbackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/playbackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="podcastplaybackview" long-name="podcastplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/podcastplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="podcastview" long-name="podcastview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/podcastview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpbrowsedialog" long-name="upnpbrowsedialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/upnpbrowsedialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpplaybackdialog" long-name="upnpplaybackdialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/upnpplaybackdialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpplaybackview" long-name="upnpplaybackview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/upnpplaybackview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="visualizationmenudialog" long-name="visualizationmenudialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/visualizationmenudialog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="visualizationview" long-name="visualizationview">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/visualizationview/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="waitnotedialog" long-name="waitnotedialog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/views/waitnotedialog/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="musicplayer_plat" long-name="musicplayer_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audio_application_features_api" long-name="audio_application_features_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="musicplayer_plat" long-name="musicplayer_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_player_app_api" long-name="mpx_music_player_app_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_player_commonui_api" long-name="mpx_music_player_commonui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_player_media_key_handler_api" long-name="mpx_music_player_media_key_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_player_remote_control_api" long-name="mpx_music_player_remote_control_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_shop_ui_api" long-name="mpx_music_shop_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_store_api" long-name="mpx_music_store_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mpx_music_wap_adapter_cenrep_api" long-name="mpx_music_wap_adapter_cenrep_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="music_content_publisher_plugin_api" long-name="music_content_publisher_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="music_visualization_plugin_api" long-name="music_visualization_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/group"/>
      </component>
     </collection>
@@ -21835,34 +22900,37 @@
    <block long-name="Radio Apps" level="apps" name="radio" levels="engine ui">
     <collection name="fmradio" long-name="FM Radio" level="ui">
      <component name="FMRadio.exe=binary" long-name="FMRadio">
-      <unit bldFile="app/radio/fmradio/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="activeidleengine" long-name="activeidleengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/radio/fmradio/activeidleengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="FMRadio" long-name="FMRadio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/radio/fmradio/FMRadio/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fmradioengine" long-name="fmradioengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/radio/fmradio/fmradioengine/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="fmradio" long-name="fmradio">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/radio/fmradio/group"/>
+     </component>
     </collection>
     <collection name="fmradioengine" long-name="FM Radio Engine" level="engine">
      <component name="FMRadioEngine.dll=binary">
-      <unit bldFile="app/radio/fmradioengine/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="radio" long-name="radio">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radio" long-name="radio">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/radio/group"/>
      </component>
     </collection>
@@ -21870,44 +22938,44 @@
    <block long-name="Voice Recorder Apps" level="apps" name="voicerec" levels="empty 1">
     <collection name="voicerecorder" long-name="Voice Recorder" level="1">
      <component name="gsplugin">
-      <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/>
      </component>
      <component name="VoiceRecorderUtils.dll=binary">
-      <unit bldFile="app/voicerec/voicerecorder/group"/>
      </component>
      <component name="VoiceRecorderRecView.dll=binary">
-<!--       <unit bldFile="app/voicerec/voicerecorder/group"/> -->
      </component>
      <component name="NewService.dll=binary">
-<!--       <unit bldFile="app/voicerec/voicerecorder/group"/> -->
      </component>
      <component name="VoiceRecorder.exe=binary">
-<!--       <unit bldFile="app/voicerec/voicerecorder/group"/> -->
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="voicerecorder" long-name="voicerecorder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/voicerec/voicerecorder/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="voicerec" long-name="voicerec">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voicerec" long-name="voicerec">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/voicerec/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="voicerec_plat" long-name="voicerec_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voicerec_plat" long-name="voicerec_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/voicerec/voicerec_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="new_file_service_api" long-name="new_file_service_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voicerecorder_public_constants_api" long-name="voicerecorder_public_constants_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
      </component>
     </collection>
@@ -21915,42 +22983,43 @@
    <block long-name="Screen Saver Apps" level="apps" name="screensaver" levels="eng plugin">
     <collection name="screensaver.exe=binary" long-name="Screen Saver" level="plugin">
      <component name="screensaver.exe=binary compo">
-      <unit bldFile="app/screensaver/screensaver.exe=binary/screensaver.exe=binary compo/group"/>
      </component>
     </collection>
     <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
      <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
      </component>
      <component name="scrsaverplugins" long-name="Screen Saver Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="BmpAnimScrPlugin" long-name="BmpAnimScrPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/BmpAnimScrPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ScreenSaverAnimPlugin" long-name="ScreenSaverAnimPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ScreenSaverGifAnimPlugin" long-name="ScreenSaverGifAnimPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="SlideshowPlugin" long-name="SlideshowPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/SlideshowPlugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="screensaver" long-name="screensaver">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screensaver" long-name="screensaver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/screensaver/group"/>
      </component>
     </collection>
@@ -21958,287 +23027,294 @@
    <block long-name="Homescreen Apps" level="apps" name="homescreen" levels="fw apps">
     <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
      <component name="activeidle3" long-name="Active Idle 3">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/>
      </component>
      <component name="exths" long-name="ExtHS">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
      </component>
      <component name="hsplugins" long-name="HS Plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/>
      </component>
      <component name="nativeuicontroller" long-name="Native UI Controller">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ai3demo" long-name="ai3demo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/ai3demo/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="buzzidle" long-name="buzzidle">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="onerow" long-name="onerow">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/onerow/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="player" long-name="player">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/player/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="root" long-name="root">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/root/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortcut" long-name="shortcut">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/shortcut/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="softindicator" long-name="softindicator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/softindicator/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="threerows" long-name="threerows">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/threerows/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="threetextrows" long-name="threetextrows">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/threetextrows/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tworows" long-name="tworows">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/tworows/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wideimage" long-name="wideimage">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/wideimage/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hspswrapper" long-name="hspswrapper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/sapiwrapper/hspswrapper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmluicontroller" long-name="xmluicontroller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluicontroller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dom" long-name="dom">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/dom/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ecomelement" long-name="ecomelement">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/ecomelement/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xndomvisitor" long-name="xndomvisitor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/ecomelement/xndomvisitor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnecomelementproxy" long-name="xnecomelementproxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/ecomelement/xnecomelementproxy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmluirendering" long-name="xmluirendering">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="odt" long-name="odt">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/odt/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnbitmapfactory" long-name="xnbitmapfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnbitmapfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnclockfactory" long-name="xnclockfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnclockfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnmenufactory" long-name="xnmenufactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnmenufactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnnewstickerfactory" long-name="xnnewstickerfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnnewstickerfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnnppluginfactory" long-name="xnnppluginfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnnppluginfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnpopupfactory" long-name="xnpopupfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnpopupfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xntextfactory" long-name="xntextfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xntextfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnviewfactory" long-name="xnviewfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnviewfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnvolumecontrolfactory" long-name="xnvolumecontrolfactory">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/renderingplugins/xnvolumecontrolfactory/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiengine" long-name="uiengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnlayoutengine" long-name="xnlayoutengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/xnlayoutengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xnutils" long-name="xnutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/xnutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiresource" long-name="uiresource">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiresource/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="idlehomescreen" long-name="idlehomescreen">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiagendaplugin2" long-name="aiagendaplugin2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/aiagendaplugin2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aiagendapluginengine" long-name="aiagendapluginengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/aiagendapluginengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizer" long-name="organizer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizerplugin" long-name="organizerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/organizerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizerplugin3row" long-name="organizerplugin3row">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/organizerplugin3row/group"/>
      </component>
     </collection>
     <collection name="menufw" long-name="Menu Framework">
      <component name="hierarchynavigator" long-name="Hierarchy Navigator">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
      </component>
      <component name="menufwui" long-name="Menu Framework UI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/group"/>
      </component>
      <component name="menusuites" long-name="Menu Suites">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menusuites/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="menufw" long-name="menufw">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hnengine" long-name="hnengine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/hnengine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hnmetadatamodel" long-name="hnmetadatamodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/hnmetadatamodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hnpresentationmodel" long-name="hnpresentationmodel">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/hnpresentationmodel/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hnutilities" long-name="hnutilities">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/hnutilities/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="matrixmenu" long-name="matrixmenu">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/matrixmenu/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmextensions" long-name="mmextensions">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/mmextensions/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmextensionmanager" long-name="mmextensionmanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/mmextensions/mmextensionmanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmfolderuiextension" long-name="mmfolderuiextension">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/mmextensions/mmfolderuiextension/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmwidgets" long-name="mmwidgets">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menufwui/mmwidgets/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="foldersuite" long-name="foldersuite">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/menufw/menusuites/foldersuite/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="homescreen" long-name="homescreen">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreen" long-name="homescreen">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="homescreen_plat" long-name="homescreen_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreen_plat" long-name="homescreen_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/homescreen/homescreen_plat/group"/>
      </component>
     </collection>
@@ -22246,14 +23322,18 @@
    <block long-name="Image Viewer UIs" level="services" name="imgvieweruis" levels="app">
     <collection name="imageviewer" long-name="Image Viewer" level="app">
      <component name="ImageViewer.exe=binary">
-      <unit bldFile="app/imgvieweruis/imageviewer/group"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="imageviewer" long-name="imageviewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/imgvieweruis/imageviewer/Group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="imgvieweruis" long-name="imgvieweruis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgvieweruis" long-name="imgvieweruis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/imgvieweruis/group"/>
      </component>
     </collection>
@@ -22261,42 +23341,43 @@
    <block long-name="Graphics UIs" level="services" name="graphicsuis" levels="util ui">
     <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
      <component name="SvgtViewerPlugin" long-name="SVGT Viewer Plugin">
-      <unit bldFile="app/graphicsuis/svgtviewer/SvgtViewerPlugin/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/graphicsuis/svgtviewer/SvgtViewerPlugin/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgtviewer" long-name="svgtviewer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/svgtviewer/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="graphicsuis" long-name="graphicsuis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphicsuis" long-name="graphicsuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="graphicsuis_plat" long-name="graphicsuis_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphicsuis_plat" long-name="graphicsuis_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt_file_view_details_dialog_api" long-name="svgt_file_view_details_dialog_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt_viewer_ui_api" long-name="svgt_viewer_ui_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svg_application_observer_utility_api" long-name="svg_application_observer_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
      </component>
     </collection>
@@ -22304,13 +23385,17 @@
    <block long-name="Help Apps" level="apps" name="helps" levels="eng ui">
     <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
      <component name="AiwHelpProvider" long-name="Aiw Help Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/helps/csxhelp/AiwHelpProvider/group"/>
      </component>
      <component name="HelpEngine.dll=binary">
-      <unit bldFile="app/helps/csxhelp/group"/>
      </component>
      <component name="cshelp.exe=binary" long-name="Cs Help">
-<!--       <unit bldFile="app/helps/csxhelp/group"/> -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="csxhelp" long-name="csxhelp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/helps/csxhelp/group"/>
      </component>
     </collection>
     <collection name="symhelp" long-name="Symbian Help" level="eng">
@@ -22318,23 +23403,21 @@
       <unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
      </component>
      <component name="cshlpcmpfrontend" long-name="CSHelp Compiler Frontend">
-      <unit bldFile="app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/>
      </component>
      <component name="cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt">
-      <unit bldFile="app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
      </component>
      <component name="helpmodel" long-name="Help" introduced="6.0">
-      <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
      </component>
      <component name="mbmcodec" long-name="MBM Codec" filter="gt">
-      <unit bldFile="app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/>
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="helps" long-name="helps">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helps" long-name="helps">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/helps/group"/>
      </component>
     </collection>
@@ -22342,52 +23425,53 @@
    <block long-name="Profile" level="apps" name="profile" levels="app">
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
      <component name="Profiles" long-name="Profiles">
-      <unit bldFile="app/profile/profilesapplication/Profiles/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/profile/profilesapplication/Profiles/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profilesapplication" long-name="profilesapplication">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profilesapplication/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="GSProfilesPlugin" long-name="GSProfilesPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profilesapplication/Profiles/GSProfilesPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProfileAiwProvider" long-name="ProfileAiwProvider">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profilesapplication/Profiles/ProfileAiwProvider/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProfileApp" long-name="ProfileApp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profilesapplication/Profiles/ProfileApp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ProfilesGSTonesPlugin" long-name="ProfilesGSTonesPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profilesapplication/Profiles/ProfilesGSTonesPlugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="profile" long-name="profile">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profile" long-name="profile">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="profile_plat" long-name="profile_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profile_plat" long-name="profile_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profile_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profiles_settings_view_api" long-name="profiles_settings_view_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
      </component>
     </collection>
@@ -22395,246 +23479,269 @@
    <block long-name="Speech Recognition UIs" level="services" name="speechsrv" levels="engine framework ui">
     <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
      <component name="devasr" long-name="Audio Recording and Speech Recognition">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/devasr/group"/>
      </component>
      <component name="devtts" long-name="Text to Speech">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/devtts/group"/>
      </component>
      <component name="nssvasapi" long-name="NSS VAS API">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
      </component>
      <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
      </component>
      <component name="profileobserverplugin" long-name="Profile Observer Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
      </component>
      <component name="sicc" long-name="Speaker Independent Custom Commands">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/sicc/group"/>
      </component>
      <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
      </component>
      <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
      </component>
      <component name="siutility" long-name="Speaker Independent Utility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/siutility/group"/>
      </component>
      <component name="speechsynthesis" long-name="Speech Synthesis">
-      <unit bldFile="app/speechsrv/srsf/speechsynthesis/group"/>
      </component>
      <component name="ttscommon" long-name="TTS Common">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
      </component>
      <component name="ttscontrollerplugin" long-name="TTS Controller Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
      </component>
      <component name="ttscustomcommands" long-name="TTS Custom Commands">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
      </component>
      <component name="ttsutility" long-name="TTS Utility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
      </component>
      <component name="vcexecutorapp" long-name="Voice Command Executor Application">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
      </component>
      <component name="vcommandexecutor" long-name="Voice Command Executor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
      </component>
      <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
      </component>
      <component name="vcommandhandler" long-name="Voice Command Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
      </component>
      <component name="vcommandmanager" long-name="Voice Command Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
      </component>
      <component name="vuiphandler" long-name="Voice UI Plugin Handler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srsf" long-name="srsf">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nssvasdbeventnotifier" long-name="nssvasdbeventnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/>
      </component>
     </collection>
     <collection name="voiceui" long-name="Voice UI" level="ui">
      <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
      </component>
      <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
      </component>
      <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
      </component>
      <component name="vcommand" long-name="VCommand">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
      </component>
      <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voiceui" long-name="voiceui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/voiceui/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="speechsrv" long-name="speechsrv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speechsrv" long-name="speechsrv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="speechsrv_plat" long-name="speechsrv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adaptation_hw_device_api" long-name="adaptation_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asrs_hw_device_api" long-name="asrs_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="grcompiler_hw_device_api" long-name="grcompiler_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speechsrv_plat" long-name="speechsrv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nlp_hw_device" long-name="nlp_hw_device">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_devasr_api" long-name="nss_devasr_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_devtts_api" long-name="nss_devtts_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_mmf_tts_custom_commands_api" long-name="nss_mmf_tts_custom_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_si_speech_recognition_data_api" long-name="nss_si_speech_recognition_data_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_srs_custom_commands_api" long-name="nss_srs_custom_commands_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_srs_utility_api" long-name="nss_srs_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_tts_common_api" long-name="nss_tts_common_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nss_tts_utility_api" long-name="nss_tts_utility_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="recognition_hw_device_api" long-name="recognition_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speech_synthesis_clientserver_api" long-name="speech_synthesis_clientserver_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srsf_cenrep_settings_api" long-name="srsf_cenrep_settings_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srsf_secondarydisplay_api" long-name="srsf_secondarydisplay_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ttp_hw_device_api" long-name="ttp_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tts_hw_device_api" long-name="tts_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui_voice_recognition_api" long-name="ui_voice_recognition_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vas_api" long-name="vas_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vas_contact_handler_api" long-name="vas_contact_handler_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vas_vcommand_api" long-name="vas_vcommand_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vcommand_settings_cenrep_api" long-name="vcommand_settings_cenrep_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vocman_hw_device_api" long-name="vocman_hw_device_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voice_commands_resource_header_api" long-name="voice_commands_resource_header_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voice_ui_accessory_button_handling_api" long-name="voice_ui_accessory_button_handling_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voice_ui_plugin_api" long-name="voice_ui_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
      </component>
     </collection>
@@ -22642,72 +23749,88 @@
    <block long-name="Web UIs" level="services" name="webuis" levels="ui app">
     <collection name="browserplugins" long-name="Browser Plugins" level="app">
      <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
      </component>
      <component name="browsergpsplugin" long-name="Browser GPS Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserplugins/browsergpsplugin/group"/>
      </component>
      <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserplugins/browsersysteminfoplugin/group"/>
      </component>
      <component name="browserwidgetutilsplugin" long-name="Browser Widget Utils Plugin">
-      <unit bldFile="app/webuis/browserplugins/browserwidgetutilsplugin/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browserplugins" long-name="browserplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserplugins/group"/>
      </component>
     </collection>
     <collection name="browserui" long-name="Browser UI" level="app">
      <component name="BROWSER" long-name="Browser">
-      <unit bldFile="app/webuis/browserui/BROWSER/group"/>
      </component>
      <component name="OperatorMenu" long-name="Operator Menu">
-      <unit bldFile="app/webuis/browserui/OperatorMenu/group"/>
      </component>
      <component name="VideoServices" long-name="Video Services">
-      <unit bldFile="app/webuis/browserui/VideoServices/group"/>
      </component>
      <component name="webuis_plat" long-name="Web UIs Platform">
-      <unit bldFile="app/webuis/browserui/webuis_plat/group"/>
      </component>
      <component name="webuis_pub" long-name="Web UIs Public">
-      <unit bldFile="app/webuis/browserui/webuis_pub/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="browser" long-name="browser">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/webuis/browserui/browser/Group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/browser/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Launcher2" long-name="Launcher2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserui/browser/Launcher2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="browserui" long-name="browserui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/browserui/group"/>
      </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="operatormenu" long-name="operatormenu">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/webuis/browserui/operatormenu/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="videoservices" long-name="videoservices">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/webuis/browserui/videoservices/group"/>
+     </component>
     </collection>
     <collection name="pushmtm" long-name="Push MTM">
      <component name="Plugins">
-      <unit bldFile="app/webuis/pushmtm/Plugins/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/webuis/pushmtm/Plugins/Group"/>
      </component>
      <component name="PushMtmCliSrv.dll=binary">
-      <unit bldFile="app/webuis/pushmtm/group"/>
      </component>
      <component name="PushMtmUi.dll=binary">
-<!--       <unit bldFile="app/webuis/pushmtm/group"/> -->
      </component>
      <component name="PushMtmUtil.dll=binary">
-<!--       <unit bldFile="app/webuis/pushmtm/group"/> -->
      </component>
      <component name="PushViewer.exe=binary">
-<!--       <unit bldFile="app/webuis/pushmtm/group"/> -->
-     </component>
-    </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="pushmtm" long-name="pushmtm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/webuis/pushmtm/Group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="webuis" long-name="webuis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webuis" long-name="webuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/webuis/group"/>
      </component>
     </collection>
@@ -22715,718 +23838,719 @@
    <block long-name="Java" level="services" name="java" levels="framework util generic rt">
     <collection name="javaextensions" long-name="Java Extensions" level="generic">
      <component name="eswt" long-name="Eswt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/group"/>
      </component>
      <component name="jsr" long-name="JSR">
-      <unit bldFile="app/java/javaextensions/jsr/group"/>
      </component>
      <component name="supplements" long-name="Supplements">
-      <unit bldFile="app/java/javaextensions/supplements/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eswtapifacade" long-name="eswtapifacade">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/eswtapifacade/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eswtdirectcontent" long-name="eswtdirectcontent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/eswtdirectcontent/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eswtinstaller" long-name="eswtinstaller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/eswtinstaller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="build" long-name="build">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/org.eclipse.ercp.swt.s60/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/mia/rscreader/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/cenrep/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/jtwironesecurity/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refuauifactory/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/rmsreserve/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60cryptotokenfactory/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60simprops/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/uanotifierui/build"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/useragent/build"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="native" long-name="native">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/eswt/org.eclipse.ercp.swt.s60/native/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60file" long-name="s60file">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/file/s60file/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60pimeka2" long-name="s60pimeka2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/pim/s60pimeka2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensor" long-name="sensor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/sensor/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60sipmidp2client" long-name="s60sipmidp2client">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/sip/s60sipmidp2client/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60sipmidp2push" long-name="s60sipmidp2push">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/sip/s60sipmidp2push/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60sipmidp2rscreader" long-name="s60sipmidp2rscreader">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/sip/s60sipmidp2rscreader/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="instplugin" long-name="instplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/wma/api_v2/instplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pushplugin" long-name="pushplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/jsr/wma/api_v2/pushplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javaai" long-name="javaai">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaextensions/supplements/javaai/group"/>
      </component>
     </collection>
     <collection name="javainstaller" long-name="Java Installer" level="generic">
      <component name="iferecognizers" long-name="Ife Recognizers">
-      <unit bldFile="app/java/javainstaller/iferecognizers/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/iferecognizers"/>
      </component>
      <component name="installationfrontend" long-name="Installation Frontend">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/installationfrontend/group"/>
      </component>
      <component name="installplugins" long-name="Install Plugins">
-      <unit bldFile="app/java/javainstaller/installplugins/group"/>
      </component>
      <component name="javarightslistener" long-name="Java Rights Listener">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/javarightslistener/group"/>
      </component>
      <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer">
-      <unit bldFile="app/java/javainstaller/midp2iferecognizer/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/iferecognizers/midp2iferecognizer/group"/>
      </component>
      <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin">
-      <unit bldFile="app/java/javainstaller/midp2otadownloadplugin/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="downloadplugins" long-name="downloadplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/downloadplugins"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javainstaller" long-name="javainstaller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javadrminstallhelper" long-name="javadrminstallhelper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/installplugins/javadrminstallhelper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp2installplugin" long-name="midp2installplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/installplugins/midp2installplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmrlclient" long-name="drmrlclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/javarightslistener/drmrlclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drmrlserver" long-name="drmrlserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javainstaller/javarightslistener/drmrlserver/group"/>
      </component>
     </collection>
     <collection name="javalegacy" long-name="Java Legacy" level="util">
      <component name="JcfCommon" long-name="Jcf Common">
-      <unit bldFile="app/java/javalegacy/JcfCommon/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/java/javalegacy/JcfCommon/Group"/>
      </component>
      <component name="j2me" long-name="J2ME">
-      <unit bldFile="app/java/javalegacy/j2me/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/doc/examples/binarydev/j2me/group/binonly"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/group/9.2"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/group/S60v31"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="binonly" long-name="binonly">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/doc/examples/binarydev/j2me/products/binonly"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="kbinonly" long-name="kbinonly">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/doc/examples/binarydev/j2me/products/kbinonly"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp2security" long-name="midp2security">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/midp2security"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="JavaSIDChecker" long-name="JavaSIDChecker">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/misc/JavaSIDChecker"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60JavaSIDChecker" long-name="S60JavaSIDChecker">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/misc/S60JavaSIDChecker"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="apn" long-name="apn">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/apn/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetoothpush" long-name="bluetoothpush">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/bluetoothpush/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bluetoothpushservice" long-name="bluetoothpushservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/bluetoothpushservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commplugins" long-name="commplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/commplugins"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="JavaTls" long-name="JavaTls">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/JavaTls/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="jcfhttpclient" long-name="jcfhttpclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/jcfhttpclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vodaKK_customiser" long-name="vodaKK_customiser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/jcfhttpclient/vodaKK_customiser/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="jcfruntimeV2" long-name="jcfruntimeV2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/jcfruntimeV2"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="jtwironesecurity" long-name="jtwironesecurity">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/jtwironesecurity"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcdgd" long-name="lcdgd">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/lcdgd/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lcdgr" long-name="lcdgr">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/lcdgr/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="multiprocess" long-name="multiprocess">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/mailboxipc/examples/multiprocess"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="paul" long-name="paul">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/mailboxipc/examples/multiprocess/paul"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="peter" long-name="peter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/mailboxipc/examples/multiprocess/peter"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="singleprocess" long-name="singleprocess">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/mailboxipc/examples/singleprocess"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mailboxipc" long-name="mailboxipc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/mailboxipc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp2test" long-name="midp2test">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/midp2test/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midperm" long-name="midperm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/midperm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="NonGCFController" long-name="NonGCFController">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/NonGCFController/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="otatestserver" long-name="otatestserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/otatestserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refhttpclient" long-name="refhttpclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refhttpclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refhttpproxy" long-name="refhttpproxy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refhttpproxy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refInstallationPlugin" long-name="refInstallationPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refInstallationPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="reflcdui" long-name="reflcdui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/reflcdui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/reflcdui/group/RefUI"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refNotificationPlugin" long-name="refNotificationPlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refNotificationPlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refnotifier" long-name="refnotifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refnotifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="refpimV2" long-name="refpimV2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refpimV2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="readonlysetup" long-name="readonlysetup">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/refpimV2/tapps/readonlysetup"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60installationplugin" long-name="s60installationplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60installationplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60lcdui" long-name="s60lcdui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60lcdui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60platformrequesthandler" long-name="s60platformrequesthandler">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60platformrequesthandler/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60useragent" long-name="s60useragent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/s60useragent"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midpermtest" long-name="midpermtest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/testapps/midpermtest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="trustroots" long-name="trustroots">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/trustroots/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uanotifierui" long-name="uanotifierui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/uanotifierui"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uitestutilsimpl" long-name="uitestutilsimpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/uitestutilsimpl/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="useragent" long-name="useragent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/plugins/useragent"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hmidpS60v31" long-name="hmidpS60v31">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/products/hmidpS60v31"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemamsjcf" long-name="systemamsjcf">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/systemamsjcf"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemamsref" long-name="systemamsref">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/systemamsref"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemamsV1_5" long-name="systemamsV1_5">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/systemamsV1_5"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="silentinstall" long-name="silentinstall">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/systemamsV1_5/build/silentinstall"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Die" long-name="Die">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/Die"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="installSIS9.1" long-name="installSIS9.1">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/installSIS9.1"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midletutils" long-name="midletutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/midletutils"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="installmidlet" long-name="installmidlet">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/midletutils/installmidlet"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="launchmidlet" long-name="launchmidlet">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/midletutils/launchmidlet"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nearlyFillDrive" long-name="nearlyFillDrive">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/nearlyFillDrive"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PushKeys" long-name="PushKeys">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/PushKeys/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startirstack" long-name="startirstack">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/startirstack"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="usbon" long-name="usbon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/usbon"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wait" long-name="wait">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/tools/native/wait"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="debugagent" long-name="debugagent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/utils/debugagent/group/driver/refui/app"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/utils/debugagent/group/driver/refui/exe"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="redirapp" long-name="redirapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/utils/redirect/redirapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="s60ui" long-name="s60ui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/j2me/utils/redirect/redirapp/s60ui"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Utils" long-name="Utils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javalegacy/JcfCommon/Utils/Group"/>
      </component>
     </collection>
     <collection name="javamanager" long-name="Java Manager" level="framework">
      <component name="javabackup" long-name="Java Backup">
-      <unit bldFile="app/java/javamanager/javabackup/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javabackup"/>
      </component>
      <component name="javadrmmanager" long-name="Java DRM Manager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javadrmmanager/group"/>
      </component>
      <component name="javaregistry" long-name="Java Registry">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/newlegacy/javaregistry/group"/>
      </component>
      <component name="javasettings" long-name="Java Settings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javamanager" long-name="javamanager">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javabackupcore" long-name="javabackupcore">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javabackup/javabackupcore/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp2backup" long-name="midp2backup">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javabackup/midp2backup/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javasizehelper" long-name="javasizehelper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/javasizehelper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp" long-name="midp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/midp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="newlegacy" long-name="newlegacy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/newlegacy"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="installedappsregistry" long-name="installedappsregistry">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javaregistry/newlegacy/installedappsregistry/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appmngrplugin" long-name="appmngrplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/appmngrplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dbV2" long-name="dbV2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/dbV2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="jcfpermissiondb" long-name="jcfpermissiondb">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/jcfpermissiondb/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkaccessrepository" long-name="networkaccessrepository">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/networkaccessrepository/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="securitypolicyV2" long-name="securitypolicyV2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/securitypolicyV2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="userpreferences" long-name="userpreferences">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javamanager/javasettings/userpreferences/group"/>
      </component>
     </collection>
     <collection name="javaruntime" long-name="Java Runtime" level="rt">
      <component name="common">
-      <unit bldFile="app/java/javaruntime/common/group"/>
      </component>
      <component name="eventserver" long-name="Event Server">
-      <unit bldFile="app/java/javaruntime/eventserver/group"/>
      </component>
      <component name="jvm" long-name="JVM">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/jvm/group"/>
      </component>
      <component name="midp2ams" long-name="Midp2ams">
-      <unit bldFile="app/java/javaruntime/midp2ams/group"/>
      </component>
      <component name="redirserver" long-name="Redirect Server">
-      <unit bldFile="app/java/javaruntime/redirserver/group"/>
      </component>
      <component name="temp_j2me_root" long-name="Temp J2me Root">
-      <unit bldFile="app/java/javaruntime/temp_j2me_root/group"/>
      </component>
      <component name="utils">
-      <unit bldFile="app/java/javaruntime/utils/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remconobserver" long-name="remconobserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/common/remconobserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ThreadDump" long-name="ThreadDump">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/jvm/ibm/j9_23/tools/ThreadDump/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nativeport" long-name="nativeport">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/jvm/portinglayer/nativeport/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="midp2vmargsmodifier" long-name="midp2vmargsmodifier">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/midp2ams/midp2runtime/midp2vmargsmodifier/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="components" long-name="components">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/temp_j2me_root/components"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hmidps60" long-name="hmidps60">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/temp_j2me_root/products/hmidps60"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="j9midpS60" long-name="j9midpS60">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javaruntime/temp_j2me_root/products/j9midpS60"/>
      </component>
     </collection>
     <collection name="javautils" long-name="Java Utils" level="util">
      <component name="adt" long-name="ADT">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/adt/group"/>
      </component>
      <component name="common">
-      <unit bldFile="app/java/javautils/common/group"/>
      </component>
      <component name="iconconverter" long-name="Icon Converter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/iconconverter/group"/>
      </component>
      <component name="integrityserver" long-name="Integrity Server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/integrityserver/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/integrityserver/integrityserver/group"/>
      </component>
      <component name="jarfiledecoder" long-name="JAR File Decoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/jarfiledecoder/group"/>
      </component>
      <component name="javadrmutils" long-name="Java DRM Utils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="app/java/java_stubs/javadrmutils/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/javadrmutils/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
-      <unit bldFile="app/java/java_stubs/javadrmutils/group"/>
      </component>
      <component name="javapackagelookup" long-name="Java Package Lookup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/javapackagelookup/group"/>
      </component>
      <component name="javareader" long-name="Java Reader">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/javareader/group"/>
      </component>
      <component name="javarecognizer" long-name="Java Recognizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/javarecognizer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javautils" long-name="javautils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="integrityserverclient" long-name="integrityserverclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/integrityserver/integrityserverclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javaenvinfo" long-name="javaenvinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/javautils/javaenvinfo/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="java" long-name="java">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java" long-name="java">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="java_group" long-name="java_group">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_group" long-name="java_group">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="java_plat" long-name="java_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_plat" long-name="java_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_env_info_api" long-name="java_env_info_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_plat/java_env_info_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_registry_api" long-name="java_registry_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_plat/java_registry_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_superd_parser_api" long-name="java_superd_parser_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_plat/java_superd_parser_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="java_stubs" long-name="java_stubs">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java_stubs" long-name="java_stubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_stubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="javaenvinfo" long-name="javaenvinfo">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
      </component>
     </collection>
@@ -23434,154 +24558,148 @@
    <block long-name="RD tools" level="services" name="rndtools" levels="app ui">
     <collection name="creator" long-name="Creator" level="app">
      <component name="creator.exe=binary">
-      <unit bldFile="app/rndtools/creator/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="creator" long-name="creator">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/creator/group"/>
      </component>
     </collection>
     <collection name="filebrowser" long-name="File Browser" level="ui">
      <component name="FileBrowser.exe=binary">
-      <unit bldFile="app/rndtools/filebrowser/group"/>
      </component>
      <component name="fileopclient" long-name="File Op Client">
-      <unit bldFile="app/rndtools/filebrowser/fileopclient/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
      </component>
      <component name="fileopserver" long-name="File Op Server">
-      <unit bldFile="app/rndtools/filebrowser/fileopserver/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/filebrowser/fileopserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="filebrowser" long-name="filebrowser">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/filebrowser/group"/>
      </component>
     </collection>
     <collection name="launcher" long-name="Launcher" level="ui">
      <component name="Launcher.exe=binary">
-      <unit bldFile="app/rndtools/launcher/group"/>
      </component>
     </collection>
     <collection name="loadgen" long-name="Load Generator" level="app">
      <component name="LoadGen.exe=binary">
-      <unit bldFile="app/rndtools/loadgen/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="loadgen" long-name="loadgen">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/loadgen/group"/>
      </component>
     </collection>
     <collection name="perfhooks" long-name="Performance Hooks" level="app">
      <component name="perfhooks.exe=binary">
-      <unit bldFile="app/rndtools/perfhooks/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="perfhooks" long-name="perfhooks">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/perfhooks/group"/>
      </component>
     </collection>
     <collection name="perfmon" long-name="Performance Monitor" level="app">
      <component name="PerfMon.exe=binary">
-      <unit bldFile="app/rndtools/perfmon/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="perfmon" long-name="perfmon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/perfmon/group"/>
      </component>
     </collection>
     <collection name="screengrabber" long-name="Screen Grabber" level="ui">
      <component name="ScreenGrabber.exe=binary">
-      <unit bldFile="app/rndtools/screengrabber/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screengrabber" long-name="screengrabber">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/screengrabber/group"/>
      </component>
     </collection>
     <collection name="stifui" long-name="STIF UI" level="ui">
      <component name="stifui" long-name="STIF UI">
-      <unit bldFile="app/rndtools/stifui/stifui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/stifui/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/stifui/stifui/group"/>
      </component>
      <component name="uitestserverstarter" long-name="UI Test Server Starter">
-      <unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/stifui/uitestserverstarter/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="rndtools" long-name="rndtools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rndtools" long-name="rndtools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="htiui" long-name="htiui">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="htiui" long-name="htiui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiAdmin" long-name="HtiAdmin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiAdmin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiDeviceReboot" long-name="HtiDeviceReboot">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiDeviceReboot/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiAudioServicePlugin" long-name="HtiAudioServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiKeyEventServicePlugin" long-name="HtiKeyEventServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiMessagesServicePlugin" long-name="HtiMessagesServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiPIMServicePlugin" long-name="HtiPIMServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiScreenshotServicePlugin" long-name="HtiScreenshotServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiSysInfoServicePlugin" long-name="HtiSysInfoServicePlugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="HtiStartupWait" long-name="HtiStartupWait">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/htiui/HtiStartupWait/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="memspyui" long-name="memspyui">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="memspyui" long-name="memspyui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/rndtools/memspyui/group"/>
      </component>
     </collection>
@@ -23589,50 +24707,58 @@
    <block long-name="Techview" level="apps" span="2" name="techview" levels="services ui utils apps1 apps2 apps3">
     <collection name="connectivityapps" long-name="Connectivity Apps" level="utils">
      <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91">
-      <unit bldFile="app/techview/connectivityapps/connectivityfw/group" mrp="app/techview/connectivityapps/connectivityfw/group/connectivity_framework.mrp"/>
      </component>
      <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91">
-      <unit bldFile="app/techview/connectivityapps/connectivityservices/group" mrp="app/techview/connectivityapps/connectivityservices/group/connectivity_services.mrp"/>
      </component>
     </collection>
     <collection name="controlpanel" long-name="Control Panel" level="ui">
      <component name="cctlcolscheme" long-name="Colour Scheme Control" filter="techview">
-      <unit bldFile="app/techview/controlpanel/cctlcolscheme/group" mrp="app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/controlpanel/cctlcolscheme/group" mrp="app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
      </component>
      <component name="fepsetup" long-name="FEP Setup" filter="techview">
-      <unit bldFile="app/techview/controlpanel/fepsetup/group" mrp="app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/controlpanel/fepsetup/group" mrp="app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
      </component>
      <component name="keyclickref" long-name="Key Click Ref" filter="techview">
-      <unit bldFile="app/techview/controlpanel/keyclickref/Group" mrp="app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/controlpanel/keyclickref/Group" mrp="app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
      </component>
      <component name="soundsetup" long-name="Sound Setup" filter="techview">
-      <unit bldFile="app/techview/controlpanel/soundsetup/group" mrp="app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/controlpanel/soundsetup/group" mrp="app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
      </component>
     </collection>
     <collection name="datasyncapps" long-name="Data Sync Applications" level="apps2">
      <component name="syncmlapp" long-name="SyncML App" filter="techview">
-      <unit bldFile="app/techview/datasyncapps/syncmlapp/group" mrp="app/techview/datasyncapps/syncmlapp/group/techview_syncmlapp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/datasyncapps/syncmlapp/group" mrp="app/techview/datasyncapps/syncmlapp/group/techview_syncmlapp.mrp"/>
      </component>
     </collection>
     <collection name="installationapps" long-name="Installation Apps" level="apps2">
      <component name="installapp" long-name="Install App" filter="techview">
-      <unit bldFile="app/techview/installationapps/installapp/group" mrp="app/techview/installationapps/installapp/group/techview_installapp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/installationapps/installapp/group" mrp="app/techview/installationapps/installapp/group/techview_installapp.mrp"/>
      </component>
     </collection>
     <collection name="messagingapps" long-name="Messaging Apps" level="apps2">
      <component name="messagingui" long-name="Messaging UI" filter="techview">
-      <unit bldFile="app/techview/messagingapps/messagingui/Group" mrp="app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/messagingapps/messagingui/Group" mrp="app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
      </component>
     </collection>
     <collection name="networkingapps" long-name="Networking Apps" level="apps1">
      <component name="iapstatusapp" long-name="IAP Status App" filter="techview">
-      <unit bldFile="app/techview/networkingapps/iapstatusapp/group" mrp="app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/networkingapps/iapstatusapp/group" mrp="app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
      </component>
      <component name="networkingagentnotifier" long-name="Networking Agent Notifier" filter="techview" plugin="Y" introduced="7.0s">
-      <unit bldFile="app/techview/networkingapps/networkingagentnotifier/group" mrp="app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/networkingapps/networkingagentnotifier/group" mrp="app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
      </component>
      <component name="techviewvpnui" long-name="VPN UI" filter="techview" introduced="7.0">
-      <unit bldFile="app/techview/networkingapps/techviewvpnui/group" mrp="app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/networkingapps/techviewvpnui/group" mrp="app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
      </component>
     </collection>
     <collection name="networkingutils" long-name="Networking Utils" level="utils">
@@ -23645,62 +24771,76 @@
     </collection>
     <collection name="pimapps" long-name="PIM Apps" level="apps3">
      <component name="agenda" long-name="Agenda UI" filter="techview">
-      <unit bldFile="app/techview/pimapps/agenda/group" mrp="app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/pimapps/agenda/group" mrp="app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
      </component>
      <component name="contactstechview" long-name="Contacts" filter="techview">
-      <unit bldFile="app/techview/pimapps/contactstechview/group" mrp="app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/pimapps/contactstechview/group" mrp="app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
      </component>
      <component name="contacui" long-name="Contacts UI" filter="techview">
-      <unit bldFile="app/techview/pimapps/contacui/group" mrp="app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/pimapps/contacui/group" mrp="app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
      </component>
     </collection>
     <collection name="securityapps" long-name="Security Apps" level="apps3">
      <component name="secui" long-name="Security UI" filter="techview">
-      <unit bldFile="app/techview/securityapps/secui/group" mrp="app/techview/securityapps/secui/group/techview_secui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/securityapps/secui/group" mrp="app/techview/securityapps/secui/group/techview_secui.mrp"/>
      </component>
      <component name="securityupstechview" long-name="Security UPS Techview" filter="techview">
-      <unit bldFile="app/techview/securityapps/securityupstechview/group" mrp="app/techview/securityapps/securityupstechview/group/security_ups_techview.mrp"/>
      </component>
     </collection>
     <collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1">
      <component name="bluetoothui" long-name="Bluetooth UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/bluetoothui/group" mrp="app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/shortlinkapps/bluetoothui/group" mrp="app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
      </component>
      <component name="connectui" long-name="Connect UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/connectui/group" mrp="app/techview/shortlinkapps/connectui/group/techview_connectui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/shortlinkapps/connectui/group" mrp="app/techview/shortlinkapps/connectui/group/techview_connectui.mrp"/>
      </component>
      <component name="techviewusbui" long-name="USB UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/techviewusbui/group" mrp="app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/shortlinkapps/techviewusbui/group" mrp="app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
      </component>
     </collection>
     <collection name="techviewplat" long-name="Techview Platform" level="services">
      <component name="eikstd" long-name="EIKSTD" filter="techview">
-      <unit bldFile="app/techview/techviewplat/eikstd/group" mrp="app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewplat/eikstd/group" mrp="app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
      </component>
      <component name="feps" long-name="FEPS" filter="techview">
-      <unit bldFile="app/techview/techviewplat/feps/group" mrp="app/techview/techviewplat/feps/group/techview_feps.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewplat/feps/group" mrp="app/techview/techviewplat/feps/group/techview_feps.mrp"/>
      </component>
      <component name="techviewuiklaf" long-name="UIKLAF" filter="techview">
-      <unit bldFile="app/techview/techviewplat/techviewuiklaf/GROUP" mrp="app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewplat/techviewuiklaf/GROUP" mrp="app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
      </component>
     </collection>
     <collection name="techviewui" long-name="Techview UI" level="ui">
      <component name="techviewextras" long-name="Extras" filter="techview">
-      <unit bldFile="app/techview/techviewui/techviewextras/group" mrp="app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewui/techviewextras/group" mrp="app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
      </component>
      <component name="shell" long-name="Shell" filter="techview">
-      <unit bldFile="app/techview/techviewui/shell/group" mrp="app/techview/techviewui/shell/group/techview_shell.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewui/shell/group" mrp="app/techview/techviewui/shell/group/techview_shell.mrp"/>
      </component>
      <component name="startup" long-name="Startup" filter="techview">
-      <unit bldFile="app/techview/techviewui/startup/group" mrp="app/techview/techviewui/startup/group/techview_startup.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewui/startup/group" mrp="app/techview/techviewui/startup/group/techview_startup.mrp"/>
      </component>
      <component name="statuspane" long-name="Status Pane" filter="techview">
-      <unit bldFile="app/techview/techviewui/statuspane/group" mrp="app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/techviewui/statuspane/group" mrp="app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
      </component>
     </collection>
     <collection name="telephonyapps" long-name="Telephony Apps" level="apps1">
      <component name="techviewphoneui" long-name="Phone UI" filter="techview">
-      <unit bldFile="app/techview/telephonyapps/techviewphoneui/group" mrp="app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/telephonyapps/techviewphoneui/group" mrp="app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
      </component>
     </collection>
     <collection name="testapps" long-name="Test Apps" level="utils">
@@ -23708,16 +24848,16 @@
       <unit mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
      </component>
      <component name="rschandlerui" long-name="Resource Handler UI" filter="techview">
-      <unit bldFile="app/techview/testapps/rschandler/TVResourceHandler/group" mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
      </component>
      <component name="statdevice" long-name="STAT Device" filter="techview">
-      <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
      </component>
      <component name="simpleapp" long-name="Simple App" filter="techview">
-      <unit bldFile="app/techview/testapps/simpleapp/group" mrp="app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/testapps/simpleapp/group" mrp="app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
      </component>
      <component name="memspy" long-name="MemSpy" filter="techview" introduced="9.2" class="test" purpose="development" license-values="3">
-      <unit bldFile="app/techview/testapps/memspy/group" mrp="app/techview/testapps/memspy/group/graphics_memspy.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+              <unit bldFile="app/techview/testapps/memspy/group" mrp="app/techview/testapps/memspy/group/graphics_memspy.mrp"/>
      </component>
     </collection>
     <collection name="toolkit" long-name="Toolkit" level="utils">
@@ -23732,1050 +24872,3138 @@
       <unit version="9.4" mrp="os/deviceplatformrelease/symbianosbld/cedarutils/techview_roms_9.4.mrp"/>
      </component>
      <component name="romkit" long-name="ROM Kit" filter="techview">
-      <unit bldFile="app/techview/toolkit/romkit/group" mrp="app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/toolkit/romkit/group" mrp="app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
      </component>
     </collection>
     <collection name="utilityapps" long-name="Utility Apps" level="apps2">
      <component name="helptechview" long-name="Help" filter="techview">
-      <unit bldFile="app/techview/utilityapps/helptechview/group" mrp="app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/utilityapps/helptechview/group" mrp="app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
      </component>
      <component name="timew" long-name="World Time" filter="techview">
-      <unit bldFile="app/techview/utilityapps/timew/group" mrp="app/techview/utilityapps/timew/group/techview_timew.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/utilityapps/timew/group" mrp="app/techview/utilityapps/timew/group/techview_timew.mrp"/>
      </component>
     </collection>
     <collection name="avapps" long-name="A/V Apps" level="apps3">
      <component name="techviewaudio" long-name="Audio" filter="techview">
-      <unit bldFile="app/techview/avapps/techviewaudio/Group" mrp="app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/avapps/techviewaudio/Group" mrp="app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
      </component>
     </collection>
     <collection name="buildverification" long-name="Build Verification" level="services">
      <component name="smoketest" long-name="Smoke Test" filter="gt">
-      <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
      </component>
     </collection>
     <collection name="sysvalidation" long-name="System Validation" level="services">
      <component name="systemtestos" long-name="System Test OS" filter="systemtest">
-      <unit bldFile="app/techview/sysvalidation/systemtestos/Group" mrp="app/techview/sysvalidation/systemtestos/Group/systemtest_os.mrp"/>
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/sysvalidation/systemtestos/Group" mrp="app/techview/sysvalidation/systemtestos/Group/systemtest_os.mrp"/>
      </component>
      <component name="systemtesttools" long-name="System Test Tools" filter="systemtest">
-      <unit bldFile="app/techview/sysvalidation/systemtesttools/Group" mrp="app/techview/sysvalidation/systemtesttools/Group/systemtest_tools.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app/techview/sysvalidation/systemtesttools/Group" mrp="app/techview/sysvalidation/systemtesttools/Group/systemtest_tools.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="stubs" level="new" name="stubs">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="PtiT9Core_stub" long-name="PtiT9Core_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PtiT9Core_stub" long-name="PtiT9Core_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/PtiT9Core_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="audiostubs" long-name="audiostubs">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="addeddevsoundcontrolcistub" long-name="addeddevsoundcontrolcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/addeddevsoundcontrolcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="aacdecoderconfigcistub" long-name="aacdecoderconfigcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/aacdecoderconfigcistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiovibracontrolcistub" long-name="audiovibracontrolcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="eaacplusdecoderintfccistub" long-name="eaacplusdecoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/eaacplusdecoderintfccistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="errorconcealmentintfccistub" long-name="errorconcealmentintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/errorconcealmentintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711decoderintfccistub" long-name="g711decoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711decoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g711encoderintfccistub" long-name="g711encoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g711encoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729decoderintfccistub" long-name="g729decoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729decoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="g729encoderintfccistub" long-name="g729encoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/g729encoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiocodeccistubs" long-name="audiocodeccistubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbcdecoderintfccistub" long-name="ilbcdecoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcdecoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ilbcencoderintfccistub" long-name="ilbcencoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ilbcencoderintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ra8decoderintfccistub" long-name="ra8decoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/ra8decoderintfccistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sbcencoderintfccistub" long-name="sbcencoderintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/sbcencoderintfccistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speechencoderconfigcistub" long-name="speechencoderconfigcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/speechencoderconfigcistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wmadecodercintfccistub" long-name="wmadecodercintfccistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/wmadecodercintfccistub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioequalizercistub" long-name="audioequalizercistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/audioequalizercistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="bassboostcistub" long-name="bassboostcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/bassboostcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="distanceattenuationcistub" long-name="distanceattenuationcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/distanceattenuationcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="environmentalreverbcistub" long-name="environmentalreverbcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/environmentalreverbcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioeffectscistubs" long-name="audioeffectscistubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="listenerdopplercistub" long-name="listenerdopplercistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerdopplercistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="listenerlocationcistub" long-name="listenerlocationcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerlocationcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="listenerorientationcistub" long-name="listenerorientationcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/listenerorientationcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="loudnesscistub" long-name="loudnesscistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/loudnesscistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="roomlevelcistub" long-name="roomlevelcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/roomlevelcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sourcedopplercistub" long-name="sourcedopplercistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcedopplercistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sourcelocationcistub" long-name="sourcelocationcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourcelocationcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sourceorientationcistub" long-name="sourceorientationcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/sourceorientationcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="stereowideningcistub" long-name="stereowideningcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioeffectscistubs/stereowideningcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="CustomInterfaceProxyFactory_stub" long-name="CustomInterfaceProxyFactory_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/CustomInterfaceProxyFactory_stub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioenhancementfactorystubs" long-name="audioenhancementfactorystubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MessageHandlerFactory_stub" long-name="MessageHandlerFactory_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/MessageHandlerFactory_stub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audioinputcistub" long-name="audioinputcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioinputcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiooutputcistub" long-name="audiooutputcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiooutputcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiovisualizationstub" long-name="audiovisualizationstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiovisualizationstub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devsoundextensions_stubs" long-name="devsoundextensions_stubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmfaudioserverfactorystub" long-name="mmfaudioserverfactorystub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmfdevsoundadaptation_stub" long-name="mmfdevsoundadaptation_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/mmfdevsoundadaptation_stub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="restrictedaudiooutputcistub" long-name="restrictedaudiooutputcistub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fmradiotunercontrolstub" long-name="fmradiotunercontrolstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiostubs" long-name="audiostubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/audiostubs/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="btaudioadaptation_stub" long-name="btaudioadaptation_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="btaudioadaptation_stub" long-name="btaudioadaptation_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="drm_stubs" long-name="drm_stubs">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_stubs" long-name="drm_stubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/drm_stubs/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="licensee_tsy_stub" long-name="licensee_tsy_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="licensee_tsy_stub" long-name="licensee_tsy_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/licensee_tsy_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ocrsrv_stub" long-name="ocrsrv_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ocrsrv_stub" long-name="ocrsrv_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="omasuplasnconverterstubimpl" long-name="omasuplasnconverterstubimpl">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omasuplasnconverterstubimpl" long-name="omasuplasnconverterstubimpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="posmsgpluginreferenceimpl" long-name="posmsgpluginreferenceimpl">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="posmsgpluginreferenceimpl" long-name="posmsgpluginreferenceimpl">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="power_save_display_mode_stub" long-name="power_save_display_mode_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="power_save_display_mode_stub" long-name="power_save_display_mode_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="simatk_tsy_stub" long-name="simatk_tsy_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simatk_tsy_stub" long-name="simatk_tsy_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/simatk_tsy_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="srsfenginestub" long-name="srsfenginestub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="adaptationhwdevice" long-name="adaptationhwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="grcompilerhwdevice" long-name="grcompilerhwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srsfenginestub" long-name="srsfenginestub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="nlphwdevice" long-name="nlphwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="recognitionhwdevice" long-name="recognitionhwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ttphwdevice" long-name="ttphwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ttshwdevice" long-name="ttshwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vocmanhwdevice" long-name="vocmanhwdevice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="systemswstubs" long-name="systemswstubs">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accessorypolicyreference" long-name="accessorypolicyreference">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="asyreference" long-name="asyreference">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/asyreference/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="examplecommonisc" long-name="examplecommonisc">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="exampledsy" long-name="exampledsy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="featuremanagerstub" long-name="featuremanagerstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemswstubs" long-name="systemswstubs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrmhapticsstubplugin" long-name="hwrmhapticsstubplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hwrmstubplugins" long-name="hwrmstubplugins">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sensorchannelsreference" long-name="sensorchannelsreference">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ssyreference" long-name="ssyreference">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="startupadaptationstub" long-name="startupadaptationstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tiltcompensationstub" long-name="tiltcompensationstub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="TVOutConfig" long-name="TVOutConfig">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wiredbearerreference" long-name="wiredbearerreference">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="tactileclickplugin_stub" long-name="tactileclickplugin_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactileclickplugin_stub" long-name="tactileclickplugin_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="wlanhwinit_stub" long-name="wlanhwinit_stub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlanhwinit_stub" long-name="wlanhwinit_stub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
    </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="commonemail" level="new" name="commonemail">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="commonemail" long-name="commonemail">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonemail" long-name="commonemail">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="email_plat" long-name="email_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="email_setup_plugin_api" long-name="email_setup_plugin_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="email_plat" long-name="email_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/email_plat/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="emailcontacts" long-name="emailcontacts">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactactionmenu" long-name="contactactionmenu">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="callplugin" long-name="callplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/callplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contactactionservice" long-name="contactactionservice">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pocplugin" long-name="pocplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/pocplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="saveascontactplugin" long-name="saveascontactplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/saveascontactplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sendplugin" long-name="sendplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/sendplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailcontacts" long-name="emailcontacts">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotecontactlookup" long-name="remotecontactlookup">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingplugin" long-name="settingplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/settingplugin/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="emailhelp" long-name="emailhelp">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailhelp" long-name="emailhelp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailhelp/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="emailservices" long-name="emailservices">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emaildebug" long-name="emaildebug">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonlib" long-name="commonlib">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailframework/commonlib/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailframework" long-name="emailframework">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailframework/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cmailhandlerplugin" long-name="cmailhandlerplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailserver/cmailhandlerplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailserver" long-name="emailserver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailserver/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mailserverautostart" long-name="mailserverautostart">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailserver/mailserverautostart/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="base_plugin" long-name="base_plugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/base_plugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailstore" long-name="emailstore">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="debuglog" long-name="debuglog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/debuglog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="exe" long-name="exe">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/exe/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="message_store" long-name="message_store">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="PointSecMonitor" long-name="PointSecMonitor">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/message_store/PointSecMonitor/Group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="preinstall" long-name="preinstall">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/emailstore/preinstall/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailservices" long-name="emailservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="psmruadapter" long-name="psmruadapter">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="emailuis" long-name="emailuis">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailui" long-name="emailui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fsmtms" long-name="fsmtms">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remove" long-name="remove">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/remove/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ui" long-name="ui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/ui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uidata" long-name="uidata">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/fsmtms/uidata/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sendasmtm" long-name="sendasmtm">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="sendashelper" long-name="sendashelper">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/emailui/sendasmtm/sendashelper/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="emailuis" long-name="emailuis">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gsemailsettings" long-name="gsemailsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="fsscrollbarplugin" long-name="fsscrollbarplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/uicomponents/fsscrollbarplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uicomponents" long-name="uicomponents">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="widget" long-name="widget">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/widget/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gswidgetsettings" long-name="gswidgetsettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/emailuis/widget/gswidgetsettings/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ipsservices" long-name="ipsservices">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipsservices" long-name="ipsservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/ipsservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipssosaoplugin" long-name="ipssosaoplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipssosplugin" long-name="ipssosplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipssossettings" long-name="ipssossettings">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="legacy" long-name="legacy">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iad_rofs" long-name="iad_rofs">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/legacy/iad_rofs/group"/>
-     </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/iad_rofs/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ls_pt_hack" long-name="ls_pt_hack">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/legacy/ls_pt_hack/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingwizard" long-name="settingwizard">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/legacy/settingwizard/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="meetingrequest" long-name="meetingrequest">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="meetingrequest" long-name="meetingrequest">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mragnversit2" long-name="mragnversit2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrcasplugin" long-name="mrcasplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrcommon" long-name="mrcommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrdb" long-name="mrdb">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrentry" long-name="mrentry">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrgui" long-name="mrgui">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrfieldbuildercommon" long-name="mrfieldbuildercommon">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/mrfieldbuildercommon/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrfieldbuilderplugin" long-name="mrfieldbuilderplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/mrfieldbuilderplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrfieldbuilderpluginextension" long-name="mrfieldbuilderpluginextension">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/mrfieldbuilderpluginextension/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrfieldevent" long-name="mrfieldevent">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/mrfieldevent/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrlocationplugin" long-name="mrlocationplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrgui/mrlocationplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mricalviewer" long-name="mricalviewer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrpolicy" long-name="mrpolicy">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrservices" long-name="mrservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrtasks" long-name="mrtasks">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrurlparserplugin" long-name="mrurlparserplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrutils" long-name="mrutils">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrutilscalplugin" long-name="mrutilscalplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrversit2" long-name="mrversit2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrviewer" long-name="mrviewer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mrviewercalplugin" long-name="mrviewercalplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
      </component>
     </collection>
    </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="printing" level="new" name="printing">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="printing" long-name="printing">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="printing" long-name="printing">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="ImagePrint" long-name="ImagePrint">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="clog" long-name="clog">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/clog/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ImagePrint" long-name="ImagePrint">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="btprotocol" long-name="btprotocol">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/DeviceProtocols/btprotocol/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dpof" long-name="dpof">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/DeviceProtocols/dpof/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="pictbridge2" long-name="pictbridge2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/DeviceProtocols/pictbridge2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="upnpprotocolfw2" long-name="upnpprotocolfw2">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xhtmlfilecomposer" long-name="xhtmlfilecomposer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/DeviceProtocols/xhtmlfilecomposer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ImagePrintEngine" long-name="ImagePrintEngine">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ImagePrintServer" long-name="ImagePrintServer">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintEngine/ImagePrintServer/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ImagePrintUI" long-name="ImagePrintUI">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintUI/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageprintapp" long-name="imageprintapp">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintUI/imageprintapp/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageprinteng" long-name="imageprinteng">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintUI/imageprinteng/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imageprintprovider" long-name="imageprintprovider">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintUI/imageprintprovider/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgpprintdll" long-name="imgpprintdll">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="app/printing/ImagePrint/ImagePrintUI/imgpprintdll/group"/>
      </component>
     </collection>
    </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="hapticsservices" level="new" name="hapticsservices">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="hapticsservices" long-name="hapticsservices">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsservices" long-name="hapticsservices">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="hapticsservices_plat" long-name="hapticsservices_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsservices_plat" long-name="hapticsservices_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactile_feedback_server_api" long-name="tactile_feedback_server_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="hapticsservices_pub" long-name="hapticsservices_pub">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsservices_pub" long-name="hapticsservices_pub">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactile_feedback_client_api" long-name="tactile_feedback_client_api">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="tactilefeedback" long-name="tactilefeedback">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactileactionplugin" long-name="tactileactionplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactilearearegistry" long-name="tactilearearegistry">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactileclickplugin" long-name="tactileclickplugin">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactilefeedbackclient" long-name="tactilefeedbackclient">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
      </component>
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactilefeedbackresolver" long-name="tactilefeedbackresolver">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
      </component>
     </collection>
    </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="mobiletv" level="new" name="mobiletv">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mobiletv" long-name="mobiletv">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mobiletv" long-name="mobiletv">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mobiletv/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="mobiletv_plat" long-name="mobiletv_plat">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mobiletv_plat" long-name="mobiletv_plat">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="mw/mobiletv/mobiletv_plat/group"/>
      </component>
     </collection>
    </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="buildplatforms" level="new" name="buildplatforms">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="buildplatforms" long-name="buildplatforms">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="buildplatforms" long-name="buildplatforms">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/buildplatforms/group"/>
      </component>
     </collection>
-   </block>
-   <!-- Following Block added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="QuickOffice" long-name="QuickOffice">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="QuickOffice" long-name="QuickOffice">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/QuickOffice/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="adobereader" long-name="adobereader">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="adobereader" long-name="adobereader">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/adobereader/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="wmdrmkeystorage_dist" long-name="wmdrmkeystorage_dist">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="wmdrmkeystorage_dist" long-name="wmdrmkeystorage_dist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/wmdrmkeystorage_dist/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="wmdrmpd_dist" long-name="wmdrmpd_dist">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="wmdrmpd_dist" long-name="wmdrmpd_dist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/wmdrmpd_dist/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="zipviewer" long-name="zipviewer">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="zipviewer" long-name="zipviewer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/zipviewer/group"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
    <block long-name="homescreentools" level="new" name="homescreentools">
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="homescreentools" long-name="homescreentools">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreentools" long-name="homescreentools">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/homescreentools/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="dtdinstaller" long-name="dtdinstaller">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dtdinstaller" long-name="dtdinstaller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="themeinstaller" long-name="themeinstaller">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="themeinstaller" long-name="themeinstaller">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
-    <!-- Following Collection added by SF via autopopulating script from S60 model -->
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
     <collection name="themetool" long-name="themetool">
-     <!-- Following Component added by SF via autopopulating script from S60 model -->
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="themetool" long-name="themetool">
-      <!-- Unit added by SF via autopopulating script from S60 model -->
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
       <unit bldFile="tools/homescreentools/themetool/group"/>
      </component>
     </collection>
    </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="contentdownload" level="new" name="contentdownload">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="contentdownload" long-name="contentdownload">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="contentdownload" long-name="contentdownload">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/contentdownload/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="" long-name="">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="" long-name="">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/contentdownload/"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="tfxserver" level="new" name="tfxserver">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="tfxserver" long-name="tfxserver">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tfxserver" long-name="tfxserver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/tfxserver/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="TfxSrvPlugin" long-name="TfxSrvPlugin">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="TfxSrvPlugin" long-name="TfxSrvPlugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/tfxserver/TfxSrvPlugin/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="tfxlistbox" long-name="tfxlistbox">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tfxlistbox" long-name="tfxlistbox">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/tfxserver/tfxlistbox/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="tfxsrvoomplugin" long-name="tfxsrvoomplugin">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tfxsrvoomplugin" long-name="tfxsrvoomplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/tfxserver/tfxsrvoomplugin/group"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="webvideo" level="new" name="webvideo">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="webvideo" long-name="webvideo">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="webvideo" long-name="webvideo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="flashlite_3_0" long-name="flashlite_3_0">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="browserplugin" long-name="browserplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/browserplugin/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="FlashRTBinding" long-name="FlashRTBinding">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/FlashRTBinding/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="flashrtpolicyserver" long-name="flashrtpolicyserver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/flashrtpolicyserver/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="hostengine" long-name="hostengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/hostengine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mmicustom" long-name="mmicustom">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/MMI/mmicustom/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mmiplugin" long-name="mmiplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/MMI/mmiplugin/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mmistub" long-name="mmistub">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/MMI/mmistub/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mmiutils" long-name="mmiutils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/MMI/mmiutils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="resources" long-name="resources">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/resources/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="saflash2" long-name="saflash2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/saflash2/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="saflash3" long-name="saflash3">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/saflash3/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="decoderengine" long-name="decoderengine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/swfmetadata/decoderengine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="swfmetadata" long-name="swfmetadata">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/swfmetadata/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="viewerfw" long-name="viewerfw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/viewerfw/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="xpsbridge" long-name="xpsbridge">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/client/saplayer/xpsbridge/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="EntanglementApi" long-name="EntanglementApi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/flashviddec/on2/platform/symbian/EntanglementApi/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/flashviddec/sorenson/platform/symbian/EntanglementApi/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="flashlite_3_0" long-name="flashlite_3_0">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="symbian" long-name="symbian">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/lib/amp/symbian"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="Symbian" long-name="Symbian">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/lib/ATSLib/Symbian"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="loc" long-name="loc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/loc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="flashdll" long-name="flashdll">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/player/platform/symbian/flashdll"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="svgdll" long-name="svgdll">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/flashlite_3_0/player/platform/symbian/svgdll"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="helix_flash_video" long-name="helix_flash_video">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="helix_flash_video" long-name="helix_flash_video">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="hxpostupgrade" long-name="hxpostupgrade">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/hxpostupgrade/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SparkCodec" long-name="SparkCodec">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/spark/SparkCodec/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SparkDecoderWrapper" long-name="SparkDecoderWrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/spark/SparkDecoderWrapper/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SparkVideoDecoder" long-name="SparkVideoDecoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/spark/SparkVideoDecoder/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="VP6Codec" long-name="VP6Codec">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/vp6/VP6Codec/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="VP6DecoderWrapper" long-name="VP6DecoderWrapper">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/vp6/VP6DecoderWrapper/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="VP6VideoDecoder" long-name="VP6VideoDecoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/complementary/webvideo/helix_flash_video/vp6/VP6VideoDecoder/group"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="websrvde" level="new" name="websrvde">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="websrvde" long-name="websrvde">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="websrvde" long-name="websrvde">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/mw/websrvde/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="ncim" long-name="ncim">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ncim" long-name="ncim">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/mw/websrvde/ncim/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ncimaccountmanager" long-name="ncimaccountmanager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/mw/websrvde/ncim/ncimaccountmanager/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ncimlogger" long-name="ncimlogger">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/mw/websrvde/ncim/ncimlogger/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ncimoviplugin" long-name="ncimoviplugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/mw/websrvde/ncim/ncimoviplugin/group"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="oemrndtools" level="new" name="oemrndtools">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="oemrndtools" long-name="oemrndtools">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="oemrndtools" long-name="oemrndtools">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="appdep" long-name="appdep">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="appdep" long-name="appdep">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/appdep/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="bctools" long-name="bctools">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknApp" long-name="BCAppAknApp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknApp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknBitmap" long-name="BCAppAknBitmap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknBitmap/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknDlg" long-name="BCAppAknDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknEditor" long-name="BCAppAknEditor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknEditor/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknEdSts" long-name="BCAppAknEdSts">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknEdSts/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknGlbDlg" long-name="BCAppAknGlbDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknGlbDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknGrid" long-name="BCAppAknGrid">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknGrid/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknLayout" long-name="BCAppAknLayout">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknLayout/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknLists" long-name="BCAppAknLists">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknLists/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknNote" long-name="BCAppAknNote">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknNote/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknPopup" long-name="BCAppAknPopup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknPopup/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknQueCon" long-name="BCAppAknQueCon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknQueCon/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknQueDlg" long-name="BCAppAknQueDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknQueDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknQueVal" long-name="BCAppAknQueVal">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknQueVal/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknSkins" long-name="BCAppAknSkins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknSkins/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknSpane" long-name="BCAppAknSpane">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknSpane/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknStngItm" long-name="BCAppAknStngItm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknStngItm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknStngPg" long-name="BCAppAknStngPg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknStngPg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknStngPg2" long-name="BCAppAknStngPg2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknStngPg2/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknSystem" long-name="BCAppAknSystem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknSystem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknUtils" long-name="BCAppAknUtils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknUtils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppAknView" long-name="BCAppAknView">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppAknView/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApApItem" long-name="BCAppApApItem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApApItem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApDataHdlr" long-name="BCAppApDataHdlr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApDataHdlr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApLstItem" long-name="BCAppApLstItem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApLstItem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApSel" long-name="BCAppApSel">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApSel/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApStgsHdlr" long-name="BCAppApStgsHdlr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApStgsHdlr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppApUtils" long-name="BCAppApUtils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppApUtils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppEikLB" long-name="BCAppEikLB">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppEikLB/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppErrorUI" long-name="BCAppErrorUI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppErrorUI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppFavDb" long-name="BCAppFavDb">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppFavDb/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppFavItem" long-name="BCAppFavItem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppFavItem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppFavWapAp" long-name="BCAppFavWapAp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppFavWapAp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppIPv6" long-name="BCAppIPv6">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppIPv6/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLbs" long-name="BCAppLbs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppLbs/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLbsCommon" long-name="BCAppLbsCommon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppLbsCommon/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLbsPosition" long-name="BCAppLbsPosition">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppLbsPosition/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppMain" long-name="BCAppMain">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppMain/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppMiscUtils" long-name="BCAppMiscUtils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppMiscUtils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppNpdApi" long-name="BCAppNpdApi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppNpdApi/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkDlgs" long-name="BCAppPbkDlgs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkDlgs/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkEng" long-name="BCAppPbkEng">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkEng/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkFldInf" long-name="BCAppPbkFldInf">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkFldInf/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkItem" long-name="BCAppPbkItem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkItem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkItemFld" long-name="BCAppPbkItemFld">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkItemFld/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkMisc" long-name="BCAppPbkMisc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkMisc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppPbkViewSta" long-name="BCAppPbkViewSta">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppPbkViewSta/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppSendUi" long-name="BCAppSendUi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppSendUi/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppSpdiaCtrl" long-name="BCAppSpdiaCtrl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppSpdiaCtrl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppStrLdr" long-name="BCAppStrLdr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppStrLdr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppTextRes" long-name="BCAppTextRes">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppTextRes/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppVibraCtrl" long-name="BCAppVibraCtrl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/apps/BCAppVibraCtrl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BcApps" long-name="BcApps">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/BcApps/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="connection" long-name="connection">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/connection/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="hostconn" long-name="hostconn">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/hostconn/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="newsoapclasses" long-name="newsoapclasses">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/newsoapclasses/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="senfragment" long-name="senfragment">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/senfragment/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SenServDesc" long-name="SenServDesc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/SenServDesc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SenServiceManager" long-name="SenServiceManager">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/SenServiceManager/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="senutils" long-name="senutils">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/senutils/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="WSTester" long-name="WSTester">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/apps/WSTester/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="asp" long-name="asp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/asp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BrCtlBCTest" long-name="BrCtlBCTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/browser/apps/BrCtlBCTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="DownloadMgrBCTest" long-name="DownloadMgrBCTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="FavouritesBCTest" long-name="FavouritesBCTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="PluginAPIBCTest" long-name="PluginAPIBCTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/browser/apps/PluginAPIBCTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="flashviewerframework" long-name="flashviewerframework">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/flashviewerframework/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BLID" long-name="BLID">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/BLID/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLmkEditor" long-name="BCAppLmkEditor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksUI/BCAppLmkEditor/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLmkItemIdDbCombiInfo" long-name="BCAppLmkItemIdDbCombiInfo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksUI/BCAppLmkItemIdDbCombiInfo/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppLmkSelector" long-name="BCAppLmkSelector">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LandmarksUI/BCAppLmkSelector/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="LocAquisition" long-name="LocAquisition">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/location/apps/LocationFW/LocAquisition/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTforIMAPI" long-name="BCTforIMAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforIMAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTforMMSClientMTMAPI" long-name="BCTforMMSClientMTMAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforMMSClientMTMAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTforNcnlistAPI" long-name="BCTforNcnlistAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforNcnlistAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mtm_client" long-name="mtm_client">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforNcnlistAPI/mtm_client/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mtm_installer" long-name="mtm_installer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforNcnlistAPI/mtm_installer/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mtm_server" long-name="mtm_server">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforNcnlistAPI/mtm_server/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTForSendUIAPI" long-name="BCTForSendUIAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTForSendUIAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTforSmartMessagingAPI" long-name="BCTforSmartMessagingAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/messaging/apps/BCTforSmartMessagingAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="crypto_test" long-name="crypto_test">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/libcrypto/crypto_test/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="topenssl" long-name="topenssl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/libcrypto/topenssl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ssl_test" long-name="ssl_test">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/ssl_test/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/ssl/ssl_test/ssl_test/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCCppWrap" long-name="BCCppWrap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCCppWrap/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCCSRuntimeSup" long-name="BCCSRuntimeSup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCCSRuntimeSup/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCException" long-name="BCException">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCException/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCNoNamespace" long-name="BCNoNamespace">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCNoNamespace/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCOpenCHeaders" long-name="BCOpenCHeaders">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCOpenCHeaders/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCOpenCWrap" long-name="BCOpenCWrap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCOpenCWrap/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCThread" long-name="BCThread">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCThread/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTypeAttrib" long-name="BCTypeAttrib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCTypeAttrib/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTypeInfo" long-name="BCTypeInfo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/BCTypeInfo/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="chartypes" long-name="chartypes">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/chartypes/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tiostreams" long-name="tiostreams">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tiostreams/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tlocale" long-name="tlocale">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tlocale/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tmath_operations" long-name="tmath_operations">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tmath_operations/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tmemory" long-name="tmemory">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tmemory/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tstl_1" long-name="tstl_1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tstl_1/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="tutility" long-name="tutility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/tutility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="widecharclassapiBCTest" long-name="widecharclassapiBCTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/apps/stdcpp/apps/widecharclassapiBCTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="mrt" long-name="mrt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/mrt/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppContentManagement" long-name="BCAppContentManagement">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/apps/BCAppContentManagement/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCAppDRMHelperLib" long-name="BCAppDRMHelperLib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/apps/BCAppDRMHelperLib/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCDRMCAFCAPS_exe" long-name="BCDRMCAFCAPS_exe">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/apps/DRM_CAF/BCDRMCAFCAPS_exe/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="DRM_CAF" long-name="DRM_CAF">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/apps/DRM_CAF/DRM_CAF/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/apps/DRM_CAF/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="multimedia" long-name="multimedia">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/multimedia/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ConnectionSettings" long-name="ConnectionSettings">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/networking/apps/ConnectionSettings/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ConnectionSettingsUI" long-name="ConnectionSettingsUI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/networking/apps/ConnectionSettingsUI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="networking" long-name="networking">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/networking/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="Calendar" long-name="Calendar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/Calendar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="Clock" long-name="Clock">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/Clock/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTestPbkDataAddEdit" long-name="BCTestPbkDataAddEdit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataAddEdit/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTestPbkDataManagement" long-name="BCTestPbkDataManagement">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkContactChangeNotifier" long-name="MTPbkContactChangeNotifier">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkContactChangeNotifier/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkContactEngine" long-name="MTPbkContactEngine">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkContactEngine/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkContactItem" long-name="MTPbkContactItem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkContactItem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkContactItemField" long-name="MTPbkContactItemField">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkContactItemField/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkContactIter" long-name="MTPbkContactIter">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkContactIter/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkFieldData" long-name="MTPbkFieldData">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkFieldData/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkFields" long-name="MTPbkFields">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkFields/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkFieldsInfo" long-name="MTPbkFieldsInfo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkFieldsInfo/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkIconId" long-name="MTPbkIconId">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkIconId/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkIconInfo" long-name="MTPbkIconInfo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkIconInfo/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkIdleFinder" long-name="MTPbkIdleFinder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTPbkIdleFinder/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTRPbkViewResourceFile" long-name="MTRPbkViewResourceFile">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkDataManagement/MTRPbkViewResourceFile/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTestPbkFetchAPI" long-name="BCTestPbkFetchAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkAddressSelect" long-name="MTPbkAddressSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkAddressSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkEmailAddressSelect" long-name="MTPbkEmailAddressSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkEmailAddressSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkEmailOverSms" long-name="MTPbkEmailOverSms">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkEmailOverSms/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkFetchCallbacks" long-name="MTPbkFetchCallbacks">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkFetchCallbacks/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkFetchDlgSelection" long-name="MTPbkFetchDlgSelection">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkFetchDlgSelection/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkMemoryEntryAddItemDlg" long-name="MTPbkMemoryEntryAddItemDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkMemoryEntryAddItemDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkMmsAddressSelect" long-name="MTPbkMmsAddressSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkMmsAddressSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkMultipleEntryFetchDlg" long-name="MTPbkMultipleEntryFetchDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkMultipleEntryFetchDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkPhoneNumberSelect" long-name="MTPbkPhoneNumberSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkPhoneNumberSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkPhoneNumberSelectBase" long-name="MTPbkPhoneNumberSelectBase">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkPhoneNumberSelectBase/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkPocAddressSelect" long-name="MTPbkPocAddressSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkPocAddressSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkSelectFieldDlg" long-name="MTPbkSelectFieldDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkSelectFieldDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkSingleEntryFetchDlg" long-name="MTPbkSingleEntryFetchDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkSingleEntryFetchDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkSingleItemFetchDlg" long-name="MTPbkSingleItemFetchDlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkSingleItemFetchDlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="MTPbkSmsAddressSelect" long-name="MTPbkSmsAddressSelect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkFetchAPI/MTPbkSmsAddressSelect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTestPbkUIUtil" long-name="BCTestPbkUIUtil">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkUIUtil/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCTestPbkVcardImportExport" long-name="BCTestPbkVcardImportExport">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/BCTestPbkVcardImportExport/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="PhoneBook" long-name="PhoneBook">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/PhoneBook/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SpeedDial" long-name="SpeedDial">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/apps/SpeedDial/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="pim" long-name="pim">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/pim/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCLogEngineTest" long-name="BCLogEngineTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/rtcct/apps/BCLogEngineTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="BCSmsUtilitiesTest" long-name="BCSmsUtilitiesTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/rtcct/apps/BCSmsUtilitiesTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="IsvTelephonyTest" long-name="IsvTelephonyTest">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/rtcct/apps/IsvTelephonyTest/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="rtcct" long-name="rtcct">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/rtcct/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="FileSystemPlugins" long-name="FileSystemPlugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/FileSystemPlugins/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="base" long-name="base">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="t_perf" long-name="t_perf">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/performance/f32/t_perf/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="prompt" long-name="prompt">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/prompt/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="f32" long-name="f32">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/validation/f32/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sfsrv" long-name="sfsrv">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/base/validation/f32/sfsrv/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="Bluetooth" long-name="Bluetooth">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/Bluetooth/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsuites" long-name="testsuites">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/Bluetooth/testsuites/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/SysLibs/testsuites/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_BTSdpAPI" long-name="T_BTSdpAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/Bluetooth/T_BTSdpAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_BTSockAddrAPI" long-name="T_BTSockAddrAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/Bluetooth/T_BTSockAddrAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_BTSockAPI" long-name="T_BTSockAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/Bluetooth/T_BTSockAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="fbserv" long-name="fbserv">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/graphics/fbserv/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_Camera" long-name="T_Camera">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/ecam/T_Camera/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_ImageDecoder" long-name="T_ImageDecoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/icl/T_ImageDecoder/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_ImageEncoder" long-name="T_ImageEncoder">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/icl/T_ImageEncoder/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioConvertUtility" long-name="T_MdaAudioConvertUtility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioConvertUtility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioInputStream" long-name="T_MdaAudioInputStream">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioInputStream/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioOutputStream" long-name="T_MdaAudioOutputStream">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioOutputStream/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioPlayerUtility" long-name="T_MdaAudioPlayerUtility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioPlayerUtility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioRecorderUtility" long-name="T_MdaAudioRecorderUtility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioRecorderUtility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MdaAudioToneUtility" long-name="T_MdaAudioToneUtility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MdaAudioToneUtility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="T_MidiClientUtility" long-name="T_MidiClientUtility">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/multimedia/mmf/T_MidiClientUtility/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="libc" long-name="libc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapfcntl" long-name="testcapfcntl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapfcntl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapioccom" long-name="testcapioccom">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapioccom/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapipc" long-name="testcapipc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapipc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapsocket" long-name="testcapsocket">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapsocket/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapstat" long-name="testcapstat">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapstat/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapstdio" long-name="testcapstdio">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapstdio/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapsystime" long-name="testcapsystime">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapsystime/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapunistd" long-name="testcapunistd">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapunistd/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcaputime" long-name="testcaputime">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcaputime/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcapwchar" long-name="testcapwchar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcapwchar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcomport" long-name="testcomport">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testcomport/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testctype" long-name="testctype">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testctype/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testdb_blr" long-name="testdb_blr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testdb_blr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testftw" long-name="testftw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testftw/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testglob" long-name="testglob">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testglob/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testifioctls" long-name="testifioctls">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testifioctls/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testinet" long-name="testinet">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testinet/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testlibcwchar" long-name="testlibcwchar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testlibcwchar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testlink" long-name="testlink">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testlink/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testlocalsocket" long-name="testlocalsocket">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testlocalsocket/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="sample" long-name="sample">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testlocalsocket/sample/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testlocblr" long-name="testlocblr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testlocblr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmisc" long-name="testmisc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmisc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="spawnchild" long-name="spawnchild">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmisc/spawnchild/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmkfifo" long-name="testmkfifo">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmkfifo/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmmap" long-name="testmmap">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmmap/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmsgqueue" long-name="testmsgqueue">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmsgqueue/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmulticast" long-name="testmulticast">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testmulticast/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testnetdb" long-name="testnetdb">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testnetdb/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testoffsetof" long-name="testoffsetof">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testoffsetof/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="childpopen3_disp" long-name="childpopen3_disp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/childpopen3_disp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="childpopen3_read_write" long-name="childpopen3_read_write">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/childpopen3_read_write/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="childpopen_read" long-name="childpopen_read">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/childpopen_read/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="childpopen_write" long-name="childpopen_write">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/childpopen_write/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="child_read_write" long-name="child_read_write">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/child_read_write/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testpipe" long-name="testpipe">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testpipe/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testprogname" long-name="testprogname">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testprogname/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testregex" long-name="testregex">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testregex/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testselect" long-name="testselect">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testselect/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemaphore" long-name="testsemaphore">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testsemaphore/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testshm" long-name="testshm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testshm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsocket" long-name="testsocket">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testsocket/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="teststdio" long-name="teststdio">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/teststdio/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="abort_test" long-name="abort_test">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/teststdlib/abort_test/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="teststdlib" long-name="teststdlib">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/teststdlib/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="teststring" long-name="teststring">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/teststring/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsyscalls" long-name="testsyscalls">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testsyscalls/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsyssim" long-name="testsyssim">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testsyssim/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsysunistd" long-name="testsysunistd">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testsysunistd/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testtime_blr" long-name="testtime_blr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testtime_blr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testwchar" long-name="testwchar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testwchar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testwcharapi" long-name="testwcharapi">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testwcharapi/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testwctype" long-name="testwctype">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testwctype/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testwideapis" long-name="testwideapis">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libc/testwideapis/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="arithmeticoper1" long-name="arithmeticoper1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/arithmeticoper1/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="arithmeticoper2" long-name="arithmeticoper2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/arithmeticoper2/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="arithmeticoper3" long-name="arithmeticoper3">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/arithmeticoper3/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="arithmeticoper4" long-name="arithmeticoper4">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/arithmeticoper4/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="dll1" long-name="dll1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/dll1/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="libdl" long-name="libdl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libdl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="libm" long-name="libm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testdouble_blr" long-name="testdouble_blr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libm/testdouble_blr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testfloat_blr" long-name="testfloat_blr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libm/testfloat_blr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testldouble_blr" long-name="testldouble_blr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libm/testldouble_blr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="libpthread" long-name="libpthread">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcondbroadcast" long-name="testcondbroadcast">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testcondbroadcast/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testconddestroy" long-name="testconddestroy">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testconddestroy/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcondinit" long-name="testcondinit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testcondinit/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcondsignal" long-name="testcondsignal">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testcondsignal/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testcondwait" long-name="testcondwait">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testcondwait/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testharness" long-name="testharness">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testharness/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testmutex" long-name="testmutex">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testmutex/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testpthread" long-name="testpthread">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testpthread/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testpthreadonce" long-name="testpthreadonce">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testpthreadonce/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemdestroy" long-name="testsemdestroy">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemdestroy/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemgetvalue" long-name="testsemgetvalue">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemgetvalue/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testseminit" long-name="testseminit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testseminit/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemopen" long-name="testsemopen">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemopen/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsempost" long-name="testsempost">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsempost/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemtimedwait" long-name="testsemtimedwait">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemtimedwait/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemtrywait" long-name="testsemtrywait">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemtrywait/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="testsemwait" long-name="testsemwait">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/stdlibs/apps/libpthread/testsemwait/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="TestPlugin" long-name="TestPlugin">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/SysLibs/ecom/TestPlugin/Group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SysLibs" long-name="SysLibs">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/symbian/apps/SysLibs/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ProfilesEngineWrapperAPI" long-name="ProfilesEngineWrapperAPI">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/syncandprovisioning/apps/ProfilesEngineWrapperAPI/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SelfSignedStartupApp" long-name="SelfSignedStartupApp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/syncandprovisioning/apps/StartupListManagementAPI/SelfSignedStartupApp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="StartupApp" long-name="StartupApp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/syncandprovisioning/apps/StartupListManagementAPI/StartupApp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="syncandprovisioning" long-name="syncandprovisioning">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/syncandprovisioning/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="accmonitoring" long-name="accmonitoring">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/accmonitoring/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="cenrepnotifyhandler" long-name="cenrepnotifyhandler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/cenrepnotifyhandler/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="featurediscovery" long-name="featurediscovery">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/featurediscovery/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="finditem" long-name="finditem">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/finditem/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="light" long-name="light">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/light/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="networkstatus" long-name="networkstatus">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/networkstatus/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="platformenv" long-name="platformenv">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/platformenv/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="powerstate" long-name="powerstate">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/powerstate/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="SystemSWMisc50Test" long-name="SystemSWMisc50Test">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/SystemSWMisc50Test/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="textresolver" long-name="textresolver">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/textresolver/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="vibra" long-name="vibra">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/apps/vibra/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="systemsw" long-name="systemsw">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/systemsw/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestlauncher" long-name="bctestlauncher">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/bctestlauncher/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesttemplate" long-name="bctesttemplate">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/bctesttemplate/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestutil" long-name="bctestutil">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/bctestutil/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestaknsound" long-name="bctestaknsound">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestaknsound/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestappfrm" long-name="bctestappfrm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestappfrm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestbuttons" long-name="bctestbuttons">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestbuttons/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestcmdlg" long-name="bctestcmdlg">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestcmdlg/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestdocandinit" long-name="bctestdocandinit">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestdocandinit/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesteditor" long-name="bctesteditor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctesteditor/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesteh" long-name="bctesteh">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctesteh/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesteikbctrl" long-name="bctesteikbctrl">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctesteikbctrl/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesteikfrm" long-name="bctesteikfrm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctesteikfrm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestfontinput" long-name="bctestfontinput">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestfontinput/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestform" long-name="bctestform">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestform/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestgrids" long-name="bctestgrids">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestgrids/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestimage" long-name="bctestimage">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestimage/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestkeylock" long-name="bctestkeylock">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestkeylock/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestlabelinfoindicators" long-name="bctestlabelinfoindicators">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestlabelinfoindicators/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestlist" long-name="bctestlist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestlist/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestmenu" long-name="bctestmenu">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestmenu/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestmisccontrol" long-name="bctestmisccontrol">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestmisccontrol/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestnote" long-name="bctestnote">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestnote/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestnotifier" long-name="bctestnotifier">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestnotifier/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestpane" long-name="bctestpane">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestpane/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctestpane/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestpopups" long-name="bctestpopups">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestpopups/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestprivateuifrm" long-name="bctestprivateuifrm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestprivateuifrm/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestptieng" long-name="bctestptieng">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestptieng/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestquery" long-name="bctestquery">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestquery/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestscreenclearer" long-name="bctestscreenclearer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestscreenclearer/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestscrollerbar" long-name="bctestscrollerbar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestscrollerbar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestsearchfield" long-name="bctestsearchfield">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestsearchfield/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestserverapp" long-name="bctestserverapp">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestserverapp/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestsettingpage" long-name="bctestsettingpage">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestsettingpage/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestskins" long-name="bctestskins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestskins/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestsliderandicons" long-name="bctestsliderandicons">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestsliderandicons/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestutilities" long-name="bctestutilities">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestutilities/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestvolume" long-name="bctestvolume">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/bctestvolume/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="S60_SDK3.0" long-name="S60_SDK3.0">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.0/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestlocation" long-name="bctestlocation">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.1/bctestlocation/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestmisc" long-name="bctestmisc">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.1/bctestmisc/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestocr" long-name="bctestocr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.1/bctestocr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="S60_SDK3.1" long-name="S60_SDK3.1">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.1/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestlocalizer" long-name="bctestlocalizer">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/bctestlocalizer/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestmisc32" long-name="bctestmisc32">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/bctestmisc32/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestpreviewpopup" long-name="bctestpreviewpopup">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/bctestpreviewpopup/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestservicehandler" long-name="bctestservicehandler">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/bctestservicehandler/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestuniteditor" long-name="bctestuniteditor">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/bctestuniteditor/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="S60_SDK3.2" long-name="S60_SDK3.2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK3.2/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestbutton" long-name="bctestbutton">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctestbutton/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestchoicelist" long-name="bctestchoicelist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctestchoicelist/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctestmix50" long-name="bctestmix50">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctestmix50/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesttoolbar" long-name="bctesttoolbar">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctesttoolbar/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesttouchpane" long-name="bctesttouchpane">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctesttouchpane/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctesttreelist" long-name="bctesttreelist">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/bctesttreelist/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="S60_SDK5.0" long-name="S60_SDK5.0">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/apps/uifw/apps/S60_SDK5.0/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bcdrivers" long-name="bcdrivers">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/bcdrivers/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="bctools" long-name="bctools">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/bctools/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="goofy" long-name="goofy">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="goofy" long-name="goofy">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/goofy/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="imaker" long-name="imaker">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="buildrom_plugins" long-name="buildrom_plugins">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/imaker/buildrom_plugins/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="imaker" long-name="imaker">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/imaker/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="memmon" long-name="memmon">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="memmon" long-name="memmon">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/memmon/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="securitychecker" long-name="securitychecker">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="securitychecker" long-name="securitychecker">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/securitychecker/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="taskmgr" long-name="taskmgr">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="taskmgr" long-name="taskmgr">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/taskmgr/group"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="memoryaccess_eka2" long-name="memoryaccess_eka2">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/taskmgr/memoryaccess_eka2/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="trk" long-name="trk">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="dbgtrccomm" long-name="dbgtrccomm">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/dbgtrccomm/group/s60"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/dbgtrccomm/group/tv"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/dbgtrccomm/group/uiq"/>
+     </component>
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="trk" long-name="trk">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/nokia_tshell"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/s60"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/s60/isv_build"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/tshell"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/tv"/>
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/oemrndtools/trk/group/tv/isv_build"/>
+     </component>
+    </collection>
+   </block>
+   <!-- Following Block added by SF via autopopulating script from S60 Model -->
+   <block long-name="toolsextensions" level="new" name="toolsextensions">
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="toolsextensions" long-name="toolsextensions">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="toolsextensions" long-name="toolsextensions">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/toolsextensions/group"/>
+     </component>
+    </collection>
+    <!-- Following Collection added by SF via autopopulating script from S60 Model -->
+    <collection name="ConfigurationTool" long-name="ConfigurationTool">
+     <!-- Following Component added by SF via autopopulating script from S60 Model -->
+     <component name="ConfigurationTool" long-name="ConfigurationTool">
+      <!-- Unit added by SF via autopopulating script from S60 Model -->
+      <unit bldFile="/ext/tools/toolsextensions/ConfigurationTool/group"/>
+     </component>
+    </collection>
+   </block>
   </layer>
  </systemModel>
 </SystemDefinition>