Add todo comment to track a better message when the API is improved