added OSGI support