Adaptation to modified api.