Add C++ version
[Java] Update variables name