Added exporting feature