Changed XML parsing structure