Added searching capability