Added support for variables.