diff --git a/broker/pom.xml b/broker/pom.xml
index 52c30264..49659947 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>org.mapdb</groupId>
             <artifactId>mapdb</artifactId>
-            <version>1.0.6</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 7a3f17ef..63ef6a76 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>org.mapdb</groupId>
             <artifactId>mapdb</artifactId>
-            <version>1.0.6</version>
+            <version>1.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -185,18 +185,19 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.dna.mqtt.commons, 
-                            org.apache.commons.logging,
-                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
-                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
-                            org.dna.mqtt.moquette.proto.messages,
+                        <Export-Package>
+                            <!--org.dna.mqtt.commons,-->
+                            <!--org.apache.commons.logging,-->
+                            <!--org.dna.mqtt.moquette.messaging.spi.impl.storage,-->
+                            <!--org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,-->
+                            org.dna.mqtt.moquette.proto.messages.*,
                             org.dna.mqtt.moquette.server.netty.metrics
                         </Export-Package>
                         <Private-Package>org.dna.mqtt.moquette.bundle,
                             ${project.groupId}.*,
                             com.lmax.*
                         </Private-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!org.dna.mqtt,*</Import-Package>
                         <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>