Updated more of the output formats to match the PEG changes.