Updated XML loader