--- a/tip_pbc/mw/inputmethods/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/inputmethods/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,63 +50,63 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="inputmethods" level="generic" levels="plugin engine framework api" long-name="Input Methods">
+   <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
 <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" purpose="optional" class="api">
+<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
 </component>
-<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" purpose="optional" class="api">
+<component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
 </component>
-<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" purpose="optional" class="api">
+<component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
 </component>
 </collection>
 <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" purpose="optional" class="api">
+<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
 </component>
-<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" purpose="optional" class="api">
+<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
 </component>
-<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" purpose="optional" class="api">
+<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
 </component>
-<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" purpose="optional" class="api">
+<component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
 </component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" purpose="optional" class="api">
+<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
 </component>
-<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" purpose="optional" class="api">
+<component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
 </component>
-<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" purpose="optional" class="api">
+<component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
 </component>
-<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" purpose="optional" class="api">
+<component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
 </component>
-<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" purpose="optional" class="api">
+<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
 </component>
 </collection>
 <collection name="textinput" long-name="Text Input" level="framework">
-<component name="ptienginev2" long-name="Predictive Text Input Engine" filter="s60" purpose="optional">
+<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
 <unit bldFile="/sf/mw/inputmethods/textinput/ptienginev2/group"/>
 </component>
-<component name="akninputlanguage" long-name="Avkon Input Language" filter="s60" purpose="optional">
+<component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
 <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
 </component>
-<component name="peninputarc" long-name="Pen Input Arc" filter="s60" purpose="optional">
+<component name="peninputarc" filter="s60" long-name="Pen Input Arc">
 <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
 </component>
 </collection>
 <collection name="fep" long-name="FEP" level="engine">
-<component name="aknfep" long-name="Avkon FEP" filter="s60" purpose="optional" plugin="Y">
+<component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
 <unit bldFile="/sf/mw/inputmethods/fepstub/group"/>
 </component>
 <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">