More updates to importer