Core-1973 more chnages in api call