OSGi support #4