Updating for improved JSON handling