Grant service refactor