Updates to reflect improved JSON handling