Updated XML files to new format