Working towards the new search architecture