Added support for arrays