Improved importing workflow