diff -r e1a3c78941f2 -r b83b50a45c11 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Mon Sep 06 15:26:01 2010 +0100
@@ -50,69 +50,72 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+   <block name="appinstall" level="generic" levels="tool framework generic api" long-name="Application Installation">
 <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+<component name="iaupdate_api" long-name="IA Update API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
 </component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
 </component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
 </component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
 </component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+<component name="task_management_api" long-name="Task Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/task_management_api/group"/>
 </component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
 </component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
 </component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
 </component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
+<component name="sifui_api" long-name="STIF UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sifui_api/group"/>
 </component>
 </collection>
 <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
 </component>
 </collection>
 <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<component name="ncdengine_build" filter="s60" long-name="NCD Engine" introduced="^1">
+<component name="ncdengine_build" long-name="NCD API" introduced="^1" filter="s60" purpose="optional">
+<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+</component>
+<component name="ncdengine_engine" long-name="NCD Engine" introduced="^1" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/ncdengine/engine" proFile="engine.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+<component name="appinstui" long-name="Application Installer UI" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
 </component>
-<component name="appinstui_qt" filter="s60" long-name="Application Installer Qt UI" introduced="^2">
+<component name="appinstui_qt" long-name="Application Installer Qt UI" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui" proFile="appinstui.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
 <!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
 </component>
 </collection>
 <collection name="iaupdate" long-name="Independent Apps Update" level="api">
 <!-- Should reorganise into actual components -->
-<component name="iad" long-name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<component name="iad" long-name="Independent App delivery" introduced="^4" filter="s60" purpose="development">
 <unit bldFile="/sf/mw/appinstall/iaupdate" proFile="iaupdate.pro" qmakeArgs="-r"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<component name="iaupdate_build" long-name="IA Update Build" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
 </component>
 </collection>
@@ -143,7 +146,7 @@
 </component>
 </collection>
 <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+<component name="makekeys" long-name="MakeKeys" introduced="6.0" filter="gt" purpose="optional" class="PC">
 <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
 </component>
 <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">