Update the code to use the new exporter

Some small things changed as a consequence