RE: small improvement to roles mechanism