Integrated Matrix class with current classes.