Improved and tuned import.