More changes for service locator and selenium