Improved uploader