Updated uploader