Update so its an OSGi Bundle