Improve importer