--- a/foundation_system/system_model/system_definition.xml	Thu Aug 19 11:06:18 2010 +0300
+++ b/foundation_system/system_model/system_definition.xml	Tue Aug 31 16:25:42 2010 +0300
@@ -99,7 +99,10 @@
 	"root" attribute will usually be inserted by tools when merging models, although it can be set manually-->
 ]>
 <SystemDefinition schema="3.0.0">
-  <systemModel name="Symbian^3">
+  <systemModel name="Symbian^4">
+    <layer id="adapt" name="Adaptation" levels="low mw high">
+      <package id="openmaxil.nokia" tech-domain="mm" level="high" href="../../../../adapt/openmaxil.nokia/package_definition.xml"/>
+    </layer>
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
       <package id="boardsupport" level="hw" tech-domain="hb" href="../../../../os/boardsupport/package_definition.xml"/>
@@ -122,6 +125,8 @@
       <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
       <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
       <package id="osrndtools" level="services" tech-domain="to" href="../../../../os/osrndtools/package_definition.xml"/>
+      <package id="mmimaging" level="services" tech-domain="mm" href="../../../../os/mmimaging/package_definition.xml"/>
+      <package id="openmaxil" level="services" tech-domain="mm" href="../../../../os/openmaxil/package_definition.xml"/>
     </layer>
     <layer id="mw" name="Middleware" levels="generic specific">
       <package id="appsupport" level="generic" tech-domain="rt" href="../../../../mw/appsupport/package_definition.xml"/>
@@ -188,7 +193,7 @@
       <package id="contacts" level="apps" span="2" tech-domain="pr" href="../../../../app/contacts/package_definition.xml"/>
       <package id="organizer" level="apps" span="2" tech-domain="pr" href="../../../../app/organizer/package_definition.xml"/>
       <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition.xml"/>
-      <package id="commonemail" level="apps" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
+      <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
       <package id="conversations" level="apps" tech-domain="pr" href="../../../../app/conversations/package_definition.xml"/>
       <package id="im" level="apps" tech-domain="pr" href="../../../../app/im/package_definition.xml"/>
       <package id="utils" level="apps" tech-domain="pr" href="../../../../app/utils/package_definition.xml"/>