Refactor to use new service API.