Updating base class stuff