Minor changes to output to allow for complicated payloads