Started support for matrices