Use new variable substitution format