Add basic search classes