Before implement new search method