Use XML parsing better