Improved + fixed JSON data updates