I think we should add the message as soon as we have a finalised new API.