Changed for new client API.