Added more completions for roles.