XML parsing classes refactored.