Added switching between string subst and func subst