Started adding XML processing