Update for changes to JSON encoding and decoding