Update comment for new C++ files
Update C++ templates