Enrolment improvements
RoleGroup now stores the role, not the RoleType