Added supported for old xml parser