RoleGroup now stores the role, not the RoleType
Enrolment improvements