Updates to new variable substitution {{ }}