convert more classes to C++