Added initial support for roles