Minor changes
Added support for variables