Switching to OSGi DS