Now all sources converted to C++