Adding support for multi-d arrays.