Adding more support for arrays