Add more options and single file output support