Further improvements to import.