add classes Matrix, Surface