Added JSONArray support