Parsing improvements added xml parser