Location service refactor.