ProposalContacts refactoring