More work on the import export features