Changes for new CMake Common