Added support for variables and the Evaluate construct.