Working on JSON improvements.