Updated to use new JSON input (and output) data-format