Fix notify to class for future evaluator compatibility