Changes due to API structure changes.