Started to add search functionality