Updated C++ boiler plates