Added searching functionality