Improve csv storage