Updated for OSGi