More c++ classes gen