Add osgi support