Updating base class to latest