Refactored Bucket and upload progress.