Added base class