Added C++ build