Add support for API8.