Refactored data uploader.