Changes made to add the search functionality