Updated Searching Class