diff --git a/bundle/pom.xml b/bundle/pom.xml
index 58469191..12459bd6 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -27,6 +27,13 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -44,6 +51,54 @@
             <version>0.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.hawtbuf</groupId>
+            <artifactId>hawtbuf</artifactId>
+            <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.hawtdb</groupId>
+            <artifactId>hawtdb</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -56,15 +111,7 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <!--            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                </configuration>
-            </plugin>-->
+
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -72,24 +119,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.dna.mqtt.commons</Export-Package>
+                        <Export-Package>org.dna.mqtt.commons, org.apache.commons.logging</Export-Package>
                         <Private-Package>org.dna.mqtt.moquette.bundle,
-                            ${project.groupId}.*
-<!--                            com.lmax.*,
-                            io.netty.*,
-                            org.fusesource.*,
-                            org.slf4j.*,
-                            org.apache.log4j,
-                            org.apache.log4j.*-->
+                            ${project.groupId}.*,
+                            com.lmax.*
                         </Private-Package>
-                        <!--<Import-Package>java.*,javax.*,org.osgi.*</Import-Package>-->
                         <Import-Package>*</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-<!--                        <DynamicImport-Package>com.barchart.udt, com.barchart.udt.nio, 
-                            com.google.protobuf, com.jcraft.jzlib, com.sun.nio.sctp, gnu.io, javassist, 
-                            org.apache.commons.logging, org.jboss.marshalling,
-                            sun.misc, com.ibm.uvm.tools, com.sun.jdmk.comm, org.w3c.dom, org.xml.sax, org.xml.sax.helpers,
-                            javax.jmdns, javax.jms, javax.mail, javax.mail.internet</DynamicImport-Package>-->
                         <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>