Few more changes required by the API.