Updated the search class