Updated Enrollment coding