Added support for variables