More data in the JSON

Change-Id: I65769d84ce467ea7e68ad925899041a981ed7c34
Somewhat working

Change-Id: I3ff20d940a085299d27e08436ac6d65fecfe371a
Line wrapping

Change-Id: I8f7d96211478365c4b2fa8836ca72f762649e392