PdP - isMemberOf attribute

If we create a picker for policies with Invite roles, can we restrict the list? We could show only those roles with applications to which the IdP is linked, but that is not backward compatible with the current list of policies. Or even more restrictively (and even less backward compatible), only the roles linked to applications that have been selected as SPs for the relevant policy?