S-5 Add expression evaluator