Adapted to new XML structure
Adapted to new XML structure