Update to use the new API.