Added OSGI support