Updated Search Methods