WIP, adding extra field for the export.