updated service locator usages