Added ranges and enrolments