Include new stuff from C++ version