align with upstream API changes