Changes for new XChange.