Reduce organization memberships dependency