Take new cpp-common