Update mass uploader to conmply with newest changes