Add party.affiliation throughout