Some changes in new xml parser