Added new base class