Adding OSGi support