Added OSGI support.