Added support for CXX option