Improve evaluator plugin code