Updates to JsonUtils