Adding support for supplemental roles