Continued refactoring of the import method