Import performance improvements