Matrix is defined in separate header file now