Added import for Matrix class