Some changes and improvements in api calls