Update to support new vendor changes