More work on C++ library