Started adding multidimensional array support