Add the base class, with extension abilities