Adding parameters support to evaluator