Added support for conditional variable substitutions