Reduce dependency on OSGi from the runtime API