JSON improvements