Adding support for multidimensional arrays