Add support for new APIs