Updated changes for CMake for extensibility.