Added generic search strategy