Modify driver to work with new api.