Added csv attachment support