Add XML support