Refactored import#upload