Update for newer XML API