Got rid of search routine inheritance