reworked stuff for new RoleAssignment