Public api adaptations