Changes for exporting files