Made changes for API updates.