Add support for New Enrollment