Add support for roles
Add the missing imports