Updated JSON array support