Fixes exporter and implements importer