Updated for new rest service refactor.