Exporter refactoring