Fix consumption upload with new format
WIP