Added CSV output support