Work done on the import/export tool