Adding support for arrays