Refactor the Proposal System.