Move more methods into the export writer