Reworked importer and exporter classes