Use data structure as output
Updated documentation
p4#: 21617