improved role management