Added basic support for roles