Re-added the base class