Update to use latest interface