Updated XML support for namespace changes