CMakeLists updated