Updating the json to match the output, and the output to match the latest features