add cloud_watch_endpoint.
add todo comment.