Readd exporting in maintenance