Add support for new api.