Added client and added search service