Improved uploading