Add C++ stub classes