add new classes and constructor/destructor