Update to move output fields to output section.