Adding longer timeout and upload progress.