Again some modifications on CppGenerator, I/O handling works better