Add option for specifying output file name and location