--- a/symbian4/single/sysdefs/system_model.xml	Thu Apr 29 12:53:34 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Thu Apr 29 14:38:34 2010 +0100
@@ -261,6 +261,14 @@
 <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
 </component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
 </collection>
 <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
 <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
@@ -4180,12 +4188,123 @@
 </block>
 <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
 <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api"/>
-<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api"/>
-<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api"/>
-<component name="call_information_api" long-name="Call Information API" filter="s60" class="api"/>
-<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api"/>
-<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api"/>
+<component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+</component>
+<component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+</component>
+<component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+</component>
+<component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+</component>
+<component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+</component>
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+</component>
+<component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+</component>
 </collection>
 <collection name="cellular" long-name="Cellular" level="server">
 <component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>