Added the search functions too