Added variable substitution.