Changed for changes in API.