Support old export format as well as new format