Introducing changes to support new search api