Added more OSGi adaption.