Updated roles handling