Updated C++ AddInDemo