Added Support for 2-dimensional array