Add substitute support.