Adding variable substitution support