Add addition support for roles