Added ability to use variables