added more C++ classes