diff --git a/bundle/pom.xml b/bundle/pom.xml
index 12459bd6..d46988ef 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -119,7 +119,13 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.dna.mqtt.commons, org.apache.commons.logging</Export-Package>
+                        <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.*