added support for variables