Could you add a TODO to update this when we have the new client library?