Better array support