DEV: Replace Matrix by Matrix<typename T> template