Update for CMake