Updates JsonNode parsing... make it more efficient