Added new search function