More work on exporter