Roles improved