Revised the export and import functionality