CMake updates to work with BaseSystem