Added support for supplemental roles