Added code for a new base class