Add "subst" support