Restructured RoleSets to be arrays - less efficient for large numbers of roles, but a more sane representation of the data