Added searching feature