diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index 95107c5..e417c06 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -36,6 +36,9 @@
         * change in the Factory interface (FELIX-3190)
      -->
     <ipojo.package.version>1.8.1</ipojo.package.version>
+
+    <!-- Embedded manipulator version -->
+    <ipojo.manipulator.version>1.8.0</ipojo.manipulator.version>
   </properties>
 
   <description>
@@ -61,6 +64,11 @@
       <artifactId>org.apache.felix.ipojo.metadata</artifactId>
       <version>1.5.0-SNAPSHOT</version>
     </dependency>
+     <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+      <version>${ipojo.manipulator.version}</version>
+    </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-all</artifactId>
@@ -107,7 +115,19 @@
               org.osgi.framework;version=1.3, <!-- To support KF 2 -->
               org.osgi.service.cm,
               org.osgi.service.log,
-              !net.sourceforge.cobertura.* <!--  To support code coverage -->
+              !org.objectweb.asm.tree,
+              !sun.io,
+              !net.sourceforge.cobertura.*, <!--  To support code coverage -->
+
+              <!--
+                Packages used for the online-manipulator.
+                They are optionals
+              -->
+              javax.xml.parsers;resolution:=optional,
+              org.osgi.service.url;resolution:=optional,
+              org.w3c.dom;resolution:=optional,
+              org.xml.sax;resolution:=optional,
+              org.xml.sax.helpers;resolution:=optional
             </Import-Package>
             <Private-Package>
               org.apache.felix.ipojo.handlers.architecture,
@@ -124,9 +144,17 @@
               org.apache.felix.ipojo.handlers.providedservice.*; version="${ipojo.package.version}",
               org.apache.felix.ipojo.handlers.configuration; version="${ipojo.package.version}",
               org.apache.felix.ipojo.context; version="${ipojo.package.version}",
+              <!-- Embedded manipulator -->
+              org.apache.felix.ipojo.manipulator; version="${ipojo.manipulator.version}",
+              org.apache.felix.ipojo.xml.parser; version="${ipojo.manipulator.version}",
+              org.apache.felix.ipojo.*; version="${ipojo.manipulator.version}",
+              <!-- Compendium packages -->
               org.osgi.service.cm,
               org.osgi.service.log,
-              org.objectweb.asm; version=3.3.1
+              <!-- ASM (Manipulator dependencies -->
+              org.objectweb.asm.commons;version=3.3.1,
+              org.objectweb.asm.signature;version=3.3.1,
+              org.objectweb.asm;version=3.3.1
             </Export-Package>
             <Include-Resource>
               META-INF/LICENSE=LICENSE,