Added support for C++.