Update to use new interface