Updated XML parser with new functions.