Added more adaptations for base api