Add initial searching logic