Moved user roles into role-assignments resource