Simplify roles handling.