Modification to JSON Decoder (there is a lot of work to do)