Updated search method