Changed base class name to be explicit