Added new c++ classes