Updated CmakeLists