Micro changes in importer