Added more basic functionality to the candidate generator