Uploader changes for the new data format.