Bringing back CMake build