Added another base class