diff --git a/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java b/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
index ae6c9d7..d346ff2 100644
--- a/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
+++ b/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
@@ -83,13 +83,9 @@
     public void accept(ResourceVisitor visitor) {
 
         try {
-            // TODO make this configurable (react to other annotations)
-            // Only visit classes annotated with @Component or @Handler
-            String annotations = Component.class.getPackage().getName() + ".*";
-
+            // Collect all annotated classes
             Collection<Clazz> classes = m_analyzer.getClasses("",
-                    Clazz.QUERY.ANNOTATION.name(), annotations,
-                    Clazz.QUERY.NAMED.name(), "*");
+                    Clazz.QUERY.CLASSANNOTATIONS.name());
 
             classes = filter(classes);