Matrix class added