Add support for variables