Adjust to new version of 801 xml