Added XML support