Add CSV option (and make it the default)