Improving the import pipeline