Updated importer from master