Enhancing uploading handling