Update to new DataArray constructors