Add search + scan