Added more fields to ballot and race