More changes for new API.