CM: update the api a bit