Simplify role handling