Add basic search and scan functionality