Moving to XML version 8.25