Added C++ parser support for extra tags