Updating to include search functionality