Added searching ability