Refactor InterestedParty record