Add variable substitution