Add support for arrays