refactor exporter accordingly to wider approach