Add more support for CMake