Added functionality for evaluators