Added preliminary substitution support.