Further streamline the import.