ArrayNode handling greatly improved