Service Graduation report updated and service refactored