Some changes within api calling.