Re: small improvement to roles mechanism