Update to latest XML version
Add check for validation function