Added support for evaluating variables