Work on XML support.