Major C++ infrastructure implementation