New classes for export/import