Update following new API.