Make the add-on OSGi compatible