Adaptation for API8