Changes in CMakeLists.txt