Added support for API 8