Added partial evaluator