Changes to the Candidate model