Update to conform to new XML backend