Adaptation to new dedicated-api