Added support for variables in conditional statements