Use XMLParser from master