Add support for ObjC++