Support newer versions of Buzz