adding common-cpp back