Adding support for MDArray