Including wnsType and wnsTag now.