Ported some more methods to C++