Added EnrollmentController and new mapping for more complex routes