MAC and Evaluator redesign