Added support for new API