Improve evaluations model