Upgrade to work with latest driver interfaces