Currently a team, group etc are assigned to the user. Can you also have it so roles can be assigned/ linked to a team.
This will mean that resources scheduling and capacity planning can be done even if tasked arent assigned to a user as it will allow for reports or filters to search for roles in their team that are unassigned rather than looking by role by role, For complex projects and organisation this is essential.