Added the base class