Add option to allow explicitly setting output filename