Improved CMakeLists