Update to export additional information.