Updated OSGI