Importer functionality improved