Refactoring
Added export for spreadsheets