small improvement to roles mechanism