Add Payload substructures to definition dump