Do we need cmake changes?