Some new changes in xml parser