Added evaluator to parser