More refactoring of exporters