Improve the upload and import process