Made core c++ friendly