Update for xml-rs refactoring