Added a base class