Import/Export improvements