Uploader improvement