Upgrade to latest button API