improved role management

No match.