Fixed XML support