added OSGi support