improve mixture of objective-c and c++ in the wrapper classes