Changes for the new API.