Add some logging to Evaluator