Roles updates

Roles, now with looser regex matching, code reuse.