Adding OSGI support