Proper support for arrays done and working