Moved Matrix definition to header.