Implement support for new role annotations.