Role handling changes