Major revamp of evaluation service