Made into an OSGi bundle