Update the role check to be per role, not as the total string.
Should make the regexps cleaner