Initial work for search feature