Support new format