Latest version of the exporter with some extra fields