Added C++ and fixed go/java