Added searching and sorting