[INTERNAL] adjust internal to API changes.