Some changes for api.