Improve creation of candidates