Core: updated with new role names