--- a/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,20 +54,42 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
-    <collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
-     <component name="mediafetch" filter="s60" long-name="Media Fetch">
-      <unit bldFile="/sf/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component name="metadatasrv_plat" filter="s60" long-name="Legacy Metadata Services Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
-     </component>
-     <component name="metadatasrv_pub" filter="s60" long-name="Legacy Metadata Services Public Interfaces" class="api">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
+<component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
+<!-- Leave commented out until confguration is in use
+	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
+</component>
+<component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
+<unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+</component>
+<component name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public Interface Build" filter="s60" class="api">
+<!-- only needed for #ifdefs, remove when confguration is in use -->
+<unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
+</component>
+</collection>
+<collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
+<component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
+<unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+</component>
+<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
+<!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
+</component>
+<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
+<!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
+</component>
+<component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
+<!-- only needed for #ifdefs, remove when confguration is in use -->
+<unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
+</component>
+</collection>
+<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
+<component name="mediafetch" filter="s60" long-name="Media Fetch">
+<unit bldFile="/sf/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file