Added OSGi support