Add back the exporting feature