Added support for user roles