Update to new interface.