More changes. Support json arrays