Added general structure for Matrix.