Report service refactor