Improve C++ config