Updates for manual enrollments
Updated manual enrollments to parse new format