Rework the exporter classes