Added matrix storage class