Initial support for range and matrix