Add option to pass fields to output.