Updated to begin XML support