Added MatrixStorage class