Continued adding old C++ functionality