Cpp improvements