Add common service locator