Updated CMake configuration