updates to add extra support for working with Roles