Added exporting of data