Started adding support for roles