more work on EnrollmentServiceImpl