Changes for the latest api.