Add option for output generation